From d1e73853b172816454c66f570bdef2943513b893 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 28 May 2020 09:13:06 +0200
Subject: [PATCH] [CI] Use ogs group registry.
---
.gitlab-ci.yml | 8 ++++----
scripts/ci/jobs/build_image.yml | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3467a010b3c..6dcdad96272 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,10 +8,10 @@ stages:
variables:
# Docker image names
- CONTAINER_GCC_IMAGE: $CI_REGISTRY_IMAGE/gcc:$CI_COMMIT_REF_SLUG
- CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY_IMAGE/gcc-gui:$CI_COMMIT_REF_SLUG
- XUNIT_TO_JUNIT_IMAGE: registry.gitlab.com/opengeosys/ogs/xunit-to-junit
- PRECOMMIT_IMAGE: registry.gitlab.com/opengeosys/ogs/pre-commit
+ CONTAINER_GCC_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/gcc:$CI_COMMIT_REF_SLUG
+ CONTAINER_GCC_GUI_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/$CI_PROJECT_NAMESPACE/gcc-gui:$CI_COMMIT_REF_SLUG
+ XUNIT_TO_JUNIT_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/xunit-to-junit
+ PRECOMMIT_IMAGE: $CI_REGISTRY/ogs/$CI_PROJECT_NAME/pre-commit
# Build config
BUILD_TYPE: Release
BUILD_PROCESSES: "" # Empty string: builds all processes
diff --git a/scripts/ci/jobs/build_image.yml b/scripts/ci/jobs/build_image.yml
index a266b3d83f0..364f741219f 100644
--- a/scripts/ci/jobs/build_image.yml
+++ b/scripts/ci/jobs/build_image.yml
@@ -4,6 +4,8 @@ build gcc images:
- changes:
- ThirdParty/container-maker
- scripts/ci/jobs/build_image.yml
+ - if: '$CI_COMMIT_BRANCH == "master"'
+ when: always
tags:
- docker-shell
- ogs
@@ -11,7 +13,7 @@ build gcc images:
GIT_LFS_SKIP_SMUDGE: "1"
extends: .container-maker-setup
script:
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker login -u $OGS_CI_REGISTRY_USER -p $OGS_CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker pull $CONTAINER_GCC_IMAGE:latest || true
- python ThirdParty/container-maker/ogscm/cli.py --build --gitlab
--ogs off --pm system --cvode --cppcheck --docs --gcovr
--
GitLab