From dd2c023e43cd897d5d89e01212836691cd1644c9 Mon Sep 17 00:00:00 2001
From: Tobias Ribizel <ribizel@kit.edu>
Date: Thu, 27 Jul 2023 17:01:45 +0200
Subject: [PATCH] tmp: move new jobs to amdci

---
 .gitlab-ci.yml    | 60 +++--------------------------------------------
 .gitlab/image.yml |  2 +-
 2 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b5f45bcbcc..8f8f573d745 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -235,7 +235,7 @@ build/cuda102/nompi/intel/cuda/debug/static:
 # cuda 11.0 and friends on HoreKa with tests
 build/cuda110/mvapich2/gcc/cuda/debug/shared:
   extends:
-    - .build_template
+    - .build_and_test_template
     - .default_variables
     - .quick_test_condition
     - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
@@ -246,29 +246,11 @@ build/cuda110/mvapich2/gcc/cuda/debug/shared:
     BUILD_TYPE: "Debug"
     FAST_TESTS: "ON"
     NONDEFAULT_STREAM: "ON"
-    CUDA_ARCH: 80
-    USE_NAME: "cuda110-mvapich2-gcc-${CI_PIPELINE_ID}"
-    KEEP_CONTAINER: "ON"
-    USE_SLURM: 0
-
-test/cuda110/mvapich2/gcc/cuda/debug/shared:
-  extends:
-    - .horeka_test_template
-    - .default_variables
-    - .quick_test_condition
-    - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
-  variables:
-    USE_NAME: "cuda110-mvapich2-gcc-${CI_PIPELINE_ID}"
-    SLURM_PARTITION: "accelerated"
-    SLURM_GRES: "gpu:4"
-    SLURM_TIME: "02:00:00"
-  dependencies: null
-  needs: [ "build/cuda110/mvapich2/gcc/cuda/debug/shared" ]
 
 
 build/cuda110/nompi/clang/cuda/release/static:
   extends:
-    - .build_template
+    - .build_and_test_template
     - .default_variables
     - .full_test_condition
     - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
@@ -279,29 +261,11 @@ build/cuda110/nompi/clang/cuda/release/static:
     BUILD_CUDA: "ON"
     BUILD_TYPE: "Release"
     BUILD_SHARED_LIBS: "OFF"
-    CUDA_ARCH: 80
-    USE_NAME: "cuda110-nompi-clang-${CI_PIPELINE_ID}"
-    KEEP_CONTAINER: "ON"
-    USE_SLURM: 0
-
-test/cuda110/nompi/clang/cuda/release/static:
-  extends:
-    - .horeka_test_template
-    - .default_variables
-    - .full_test_condition
-    - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
-  variables:
-    USE_NAME: "cuda110-nompi-clang-${CI_PIPELINE_ID}"
-    SLURM_PARTITION: "accelerated"
-    SLURM_GRES: "gpu:1"
-    SLURM_TIME: "01:30:00"
-  dependencies: null
-  needs: [ "build/cuda110/nompi/clang/cuda/release/static" ]
 
 
 build/cuda110/nompi/intel/cuda/debug/static:
   extends:
-    - .build_template
+    - .build_and_test_template
     - .default_variables
     - .full_test_condition
     - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
@@ -313,24 +277,6 @@ build/cuda110/nompi/intel/cuda/debug/static:
     BUILD_TYPE: "Debug"
     FAST_TESTS: "ON"
     BUILD_SHARED_LIBS: "OFF"
-    CUDA_ARCH: 80
-    USE_NAME: "cuda110-nompi-intel-${CI_PIPELINE_ID}"
-    KEEP_CONTAINER: "ON"
-    USE_SLURM: 0
-
-test/cuda110/nompi/intel/cuda/debug/static:
-  extends:
-    - .horeka_test_template
-    - .default_variables
-    - .full_test_condition
-    - .use_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
-  variables:
-    USE_NAME: "cuda110-nompi-intel-${CI_PIPELINE_ID}"
-    SLURM_PARTITION: "accelerated"
-    SLURM_GRES: "gpu:1"
-    SLURM_TIME: "02:00:00"
-  dependencies: null
-  needs: [ "build/cuda110/nompi/intel/cuda/debug/static" ]
 
 
 # cuda 11.4 and friends
diff --git a/.gitlab/image.yml b/.gitlab/image.yml
index f3fb4c88761..b7a508ac2b7 100644
--- a/.gitlab/image.yml
+++ b/.gitlab/image.yml
@@ -48,7 +48,7 @@
   image: localhost:5000/cmake_316_b9196227_gko-cuda110-mvapich2-gnu9-llvm9-intel2020
   tags:
     - private_ci
-    - horeka
+    - amdci
 
 .use_gko_cuda114-openmpi-gnu11-llvm12:
   image: localhost:5000/cmake_316_b9196227_gko-cuda114-openmpi-gnu11-llvm12