From 9c53127bf23e3b89ffee8f31e98cfb46edc01a5e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 8 Apr 2024 14:15:57 +0200
Subject: [PATCH] [ci] Run linux docker job in shell runner.
---
scripts/ci/jobs/build-gui-linux.yml | 5 ++---
scripts/ci/jobs/ci_images.yml | 7 -------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/scripts/ci/jobs/build-gui-linux.yml b/scripts/ci/jobs/build-gui-linux.yml
index fd2c38c620b..cf371805056 100644
--- a/scripts/ci/jobs/build-gui-linux.yml
+++ b/scripts/ci/jobs/build-gui-linux.yml
@@ -3,9 +3,8 @@ build gui linux:
- .template-build-linux
- .test-artifacts
stage: build
- image: $CONTAINER_GCC_GUI_IMAGE
- needs: [meta, ci_images]
- tags: [docker]
+ needs: [meta]
+ tags: [envinf, shell]
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
- changes:
diff --git a/scripts/ci/jobs/ci_images.yml b/scripts/ci/jobs/ci_images.yml
index c3f947845a0..22f69ce8aa1 100644
--- a/scripts/ci/jobs/ci_images.yml
+++ b/scripts/ci/jobs/ci_images.yml
@@ -30,7 +30,6 @@ ci_images:
dotenv: build.env
script:
- |
- echo "CONTAINER_GCC_GUI_IMAGE=${CONTAINER_REGISTRY}/gcc-gui:${CONTAINER_TAG}" >> build.env
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
@@ -40,12 +39,6 @@ ci_images:
- 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 ogs.py --build --ogs off
- --cvode --cppcheck --docs --gcovr --gui --ccache
- --version_file ../../web/data/versions.json
- --tag $CONTAINER_GCC_GUI_IMAGE --upload
- --cpu-target $CPU_TARGET
- --packages build-essential
- poetry run ogscm compiler.py mpi.py ogs.py --build --ogs off
--pm off --ccache
--version_file ../../web/data/versions.json
--
GitLab