From e67b41f2f08cdbd944f837297dadf836e3d1cbee Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 8 Apr 2024 14:23:13 +0200
Subject: [PATCH] [ci] Run cpm cache and offline configure jobs in shell
runner.
---
scripts/ci/jobs/ci_images.yml | 8 --------
scripts/ci/jobs/package.yml | 10 ++++------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/scripts/ci/jobs/ci_images.yml b/scripts/ci/jobs/ci_images.yml
index 22f69ce8aa1..ee7e67a59ce 100644
--- a/scripts/ci/jobs/ci_images.yml
+++ b/scripts/ci/jobs/ci_images.yml
@@ -30,21 +30,13 @@ ci_images:
dotenv: build.env
script:
- |
- echo "CONTAINER_GCC_PM_OFF_IMAGE=${CONTAINER_REGISTRY}/gcc-pm-off:${CONTAINER_TAG}" >> build.env
echo "XUNIT_TO_JUNIT_IMAGE=${CONTAINER_REGISTRY}/xunit-to-junit:${CONTAINER_TAG}" >> build.env
echo "PRECOMMIT_IMAGE=${CONTAINER_REGISTRY}/pre-commit:${CONTAINER_TAG}" >> build.env
echo "WEB_IMAGE=${CONTAINER_REGISTRY}/web:${CONTAINER_TAG}" >> build.env
cat build.env
if [ "${BUILD_CONTAINER}" != true ]; then exit 0; fi
- source build.env
- - !reference [.container-maker-setup, before_script]
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off
- --pm off --ccache
- --version_file ../../web/data/versions.json
- --tag $CONTAINER_GCC_PM_OFF_IMAGE --upload
- --cpu-target $CPU_TARGET
- --packages build-essential jq moreutils
- cd ${CI_PROJECT_DIR}
- docker build --cache-from $XUNIT_TO_JUNIT_IMAGE -t $XUNIT_TO_JUNIT_IMAGE -f scripts/docker/saxon/Dockerfile scripts/docker/saxon
- docker push $XUNIT_TO_JUNIT_IMAGE
diff --git a/scripts/ci/jobs/package.yml b/scripts/ci/jobs/package.yml
index 586fad8e534..bf48a8ef875 100644
--- a/scripts/ci/jobs/package.yml
+++ b/scripts/ci/jobs/package.yml
@@ -1,8 +1,7 @@
create cpm cache:
stage: package
- tags: [docker]
- needs: [meta, ci_images]
- image: $CONTAINER_GCC_PM_OFF_IMAGE
+ tags: [envinf, shell]
+ needs: [meta]
rules:
- if: $CI_COMMIT_TITLE == "[versions] Updated cpm cache info."
when: never
@@ -75,9 +74,8 @@ create cpm cache:
offline configure:
stage: package
- tags: [docker]
- needs: [meta, ci_images]
- image: $CONTAINER_GCC_PM_OFF_IMAGE
+ tags: [envinf, shell]
+ needs: [meta]
rules:
# For testing: remove rules-directive
- if: '$CI_COMMIT_BRANCH == "master"'
--
GitLab