From 8a1a3a12b207981be69c22bebb0e37084063589b Mon Sep 17 00:00:00 2001
From: "Jayesh Badwaik (FZ Juelich)" <j.badwaik@fz-juelich.de>
Date: Tue, 21 Mar 2023 20:44:42 +0100
Subject: [PATCH] - ci : remove jureca from per commit CI
- jureca is often quite busy and can lead to CI times of more than an
hour long, which is counterproductive for the initial development
stage that we are in.
- If we do want to use jureca, we should add it in a daily/weekly run.
---
.gitlab/site/prod.jsc/main.yml | 97 ++++---------------
.../gitlab/ci/site/prod.jsc/main/compat.json | 1 -
.../gitlab/ci/site/prod.jsc/main/install.json | 2 +-
3 files changed, 21 insertions(+), 79 deletions(-)
diff --git a/.gitlab/site/prod.jsc/main.yml b/.gitlab/site/prod.jsc/main.yml
index 881e95c..1dd7f9f 100644
--- a/.gitlab/site/prod.jsc/main.yml
+++ b/.gitlab/site/prod.jsc/main.yml
@@ -2,18 +2,18 @@
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: (C) 2023-2023, Jayesh Badwaik (FZ Juelich) <j.badwaik@fz-juelich.de>
# --------------------------------------------------------------------------------------------------
-jureca.dc-gpu.2023.install.cuda.package.production.test.current.install:
+jusuf.batch.2023.install.none.package.production.test.current.install:
extends:
- - .platform.jureca.dc-gpu.2023
+ - .platform.jusuf.batch.2023
- .install
stage: Test
tags:
- jsc
- - jurecadc
+ - jusuf
- login
- shell
variables:
- JOB_FEATURE: cuda
+ JOB_FEATURE: none
JOB_PRESET: package
JOB_STANDARD: current
JOB_SUBPROFILE: install
@@ -21,75 +21,18 @@ jureca.dc-gpu.2023.install.cuda.package.production.test.current.install:
PLATFORM_FORWARD_PARAMETERS: --input /tmp/input --output /tmp/output
PLATFORM_INSTALL_DIR: $PLATFORM_ROOT/install
PLATFORM_LAUNCHER: slurm
- PLATFORM_LAUNCHER_PARAM: --account=exalab --nodes=1 --partition=dc-gpu --gres=gpu:4
- --time=00:30:00
- PLATFORM_NAME: jureca.dc-gpu.2023
- PLATFORM_PKGROOT: $PLATFORM_ROOT/pkgroot
- PLATFORM_ROOT: /p/project/cexalab/badwaik1/ci/$CI_JOB_ID
- PLATFORM_TOOLCHAIN_FILE: $PLATFORM_PKGROOT/srv/toolchain/cmake/toolchain.cmake
- TEST_PRESET: production.test
- stage: Test
-
-jureca.dc-gpu.2023.universal.cuda.production.test.test.debug.current.compat:
- extends:
- - .platform.jureca.dc-gpu.2023
- - .universal
- stage: Test
- tags:
- - jsc
- - jurecadc
- - login
- - shell
- variables:
- JOB_FEATURE: cuda
- JOB_PRESET: test.debug
- JOB_STANDARD: current
- JOB_SUBPROFILE: compat
- PLATFORM_BUILD_DIR: $PLATFORM_ROOT/build
- PLATFORM_FORWARD_PARAMETERS: --input /tmp/input --output /tmp/output
- PLATFORM_INSTALL_DIR: $PLATFORM_ROOT/install
- PLATFORM_LAUNCHER: slurm
- PLATFORM_LAUNCHER_PARAM: --account=exalab --nodes=1 --partition=dc-gpu --gres=gpu:4
- --time=00:30:00
- PLATFORM_NAME: jureca.dc-gpu.2023
- PLATFORM_PKGROOT: $PLATFORM_ROOT/pkgroot
- PLATFORM_ROOT: /p/project/cexalab/badwaik1/ci/$CI_JOB_ID
- PLATFORM_TOOLCHAIN_FILE: $PLATFORM_PKGROOT/srv/toolchain/cmake/toolchain.cmake
- TEST_PRESET: production.test
- stage: Test
-
-jureca.dc-gpu.2023.universal.cuda.production.test.test.release.current.compat:
- extends:
- - .platform.jureca.dc-gpu.2023
- - .universal
- stage: Test
- tags:
- - jsc
- - jurecadc
- - login
- - shell
- variables:
- JOB_FEATURE: cuda
- JOB_PRESET: test.release
- JOB_STANDARD: current
- JOB_SUBPROFILE: compat
- PLATFORM_BUILD_DIR: $PLATFORM_ROOT/build
- PLATFORM_FORWARD_PARAMETERS: --input /tmp/input --output /tmp/output
- PLATFORM_INSTALL_DIR: $PLATFORM_ROOT/install
- PLATFORM_LAUNCHER: slurm
- PLATFORM_LAUNCHER_PARAM: --account=exalab --nodes=1 --partition=dc-gpu --gres=gpu:4
- --time=00:30:00
- PLATFORM_NAME: jureca.dc-gpu.2023
+ PLATFORM_LAUNCHER_PARAM: --account=exalab --nodes=1 --partition=batch
+ PLATFORM_NAME: jusuf.batch.2023
PLATFORM_PKGROOT: $PLATFORM_ROOT/pkgroot
PLATFORM_ROOT: /p/project/cexalab/badwaik1/ci/$CI_JOB_ID
PLATFORM_TOOLCHAIN_FILE: $PLATFORM_PKGROOT/srv/toolchain/cmake/toolchain.cmake
TEST_PRESET: production.test
stage: Test
-jusuf.batch.2023.install.none.package.production.test.current.install:
+jusuf.batch.2023.universal.none.test.debug.production.test.current.compat:
extends:
- .platform.jusuf.batch.2023
- - .install
+ - .universal
stage: Test
tags:
- jsc
@@ -98,9 +41,9 @@ jusuf.batch.2023.install.none.package.production.test.current.install:
- shell
variables:
JOB_FEATURE: none
- JOB_PRESET: package
+ JOB_PRESET: test.debug
JOB_STANDARD: current
- JOB_SUBPROFILE: install
+ JOB_SUBPROFILE: compat
PLATFORM_BUILD_DIR: $PLATFORM_ROOT/build
PLATFORM_FORWARD_PARAMETERS: --input /tmp/input --output /tmp/output
PLATFORM_INSTALL_DIR: $PLATFORM_ROOT/install
@@ -113,7 +56,7 @@ jusuf.batch.2023.install.none.package.production.test.current.install:
TEST_PRESET: production.test
stage: Test
-jusuf.batch.2023.universal.none.test.debug.production.test.current.compat:
+jusuf.batch.2023.universal.none.test.release.production.test.current.compat:
extends:
- .platform.jusuf.batch.2023
- .universal
@@ -125,7 +68,7 @@ jusuf.batch.2023.universal.none.test.debug.production.test.current.compat:
- shell
variables:
JOB_FEATURE: none
- JOB_PRESET: test.debug
+ JOB_PRESET: test.release
JOB_STANDARD: current
JOB_SUBPROFILE: compat
PLATFORM_BUILD_DIR: $PLATFORM_ROOT/build
@@ -140,10 +83,10 @@ jusuf.batch.2023.universal.none.test.debug.production.test.current.compat:
TEST_PRESET: production.test
stage: Test
-jusuf.batch.2023.universal.none.test.release.production.test.current.compat:
+jusuf.gpus.2023.install.cuda.package.production.test.current.install:
extends:
- - .platform.jusuf.batch.2023
- - .universal
+ - .platform.jusuf.gpus.2023
+ - .install
stage: Test
tags:
- jsc
@@ -151,16 +94,16 @@ jusuf.batch.2023.universal.none.test.release.production.test.current.compat:
- login
- shell
variables:
- JOB_FEATURE: none
- JOB_PRESET: test.release
+ JOB_FEATURE: cuda
+ JOB_PRESET: package
JOB_STANDARD: current
- JOB_SUBPROFILE: compat
+ JOB_SUBPROFILE: install
PLATFORM_BUILD_DIR: $PLATFORM_ROOT/build
PLATFORM_FORWARD_PARAMETERS: --input /tmp/input --output /tmp/output
PLATFORM_INSTALL_DIR: $PLATFORM_ROOT/install
PLATFORM_LAUNCHER: slurm
- PLATFORM_LAUNCHER_PARAM: --account=exalab --nodes=1 --partition=batch
- PLATFORM_NAME: jusuf.batch.2023
+ PLATFORM_LAUNCHER_PARAM: --account=exalab --nodes=1 --partition=gpus --gres=gpu:1
+ PLATFORM_NAME: jusuf.gpus.2023
PLATFORM_PKGROOT: $PLATFORM_ROOT/pkgroot
PLATFORM_ROOT: /p/project/cexalab/badwaik1/ci/$CI_JOB_ID
PLATFORM_TOOLCHAIN_FILE: $PLATFORM_PKGROOT/srv/toolchain/cmake/toolchain.cmake
diff --git a/dev/etc/gitlab/ci/site/prod.jsc/main/compat.json b/dev/etc/gitlab/ci/site/prod.jsc/main/compat.json
index c283982..e6b61fc 100644
--- a/dev/etc/gitlab/ci/site/prod.jsc/main/compat.json
+++ b/dev/etc/gitlab/ci/site/prod.jsc/main/compat.json
@@ -34,7 +34,6 @@
"platform": [
"x64.cuda.12",
"x64.nvhpc.23",
- "jureca.dc-gpu.2023",
"jusuf.gpus.2023"
],
"template": [
diff --git a/dev/etc/gitlab/ci/site/prod.jsc/main/install.json b/dev/etc/gitlab/ci/site/prod.jsc/main/install.json
index cef46ea..1961961 100644
--- a/dev/etc/gitlab/ci/site/prod.jsc/main/install.json
+++ b/dev/etc/gitlab/ci/site/prod.jsc/main/install.json
@@ -33,7 +33,7 @@
"platform": [
"x64.cuda.12",
"x64.nvhpc.23",
- "jureca.dc-gpu.2023"
+ "jusuf.gpus.2023"
],
"template": [
".install"
--
GitLab