From 3c22676810bcdd8cd764a58e657b8669bf0b4c20 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 25 Nov 2020 12:00:21 +0100
Subject: [PATCH] [ci] Pin image generation to envinf1.
Otherwise we get illegal instructions when compiling OGS when
the image was built on e.g. envinf2.
---
scripts/ci/jobs/build_image.yml | 8 ++++----
scripts/ci/jobs/container.yml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index 042b24dc806..1b92bc84ccc 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -6,7 +6,7 @@ build container images:
- ThirdParty/container-maker
- scripts/ci/jobs/build_image.yml
dependencies: [meta_container]
- tags: [docker-shell]
+ tags: [envinf1-shell]
extends: .container-maker-setup
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -29,7 +29,7 @@ build xunit-to-junit image:
- scripts/docker/saxon/**/*
- scripts/ci/jobs/build_image.yml
tags:
- - docker-shell
+ - envinf1-shell
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --cache-from $XUNIT_TO_JUNIT_IMAGE -t $XUNIT_TO_JUNIT_IMAGE -f scripts/docker/saxon/Dockerfile scripts/docker/saxon
@@ -44,7 +44,7 @@ build pre-commit image:
- scripts/docker/Dockerfile.pre-commit
- scripts/ci/jobs/build_image.yml
tags:
- - docker-shell
+ - envinf1-shell
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --cache-from $PRECOMMIT_IMAGE -t $PRECOMMIT_IMAGE -f scripts/docker/Dockerfile.pre-commit scripts/docker
@@ -58,7 +58,7 @@ build web image:
- scripts/docker/Dockerfile.web
- scripts/ci/jobs/build_image.yml
tags:
- - docker-shell
+ - envinf1-shell
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build --cache-from $WEB_IMAGE -t $WEB_IMAGE -f scripts/docker/Dockerfile.web scripts/docker
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index fa37b4a2b7d..a8b6d6f5af6 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -1,6 +1,6 @@
container:
stage: package
- tags: [docker-shell]
+ tags: [envinf2-shell]
needs: [meta]
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
--
GitLab