From d8fd240bf2dcd8d89d2f5fe1ad49bf40c62d9460 Mon Sep 17 00:00:00 2001 From: Dimitra Chatzichrysou <dimitra.chatzichrysou@cern.ch> Date: Tue, 21 Sep 2021 11:48:43 +0200 Subject: [PATCH] Use notifications-main for image stream --- .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c6c51b..7170c12 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - OPENSHIFT_SERVER: https://openshift.cern.ch - NAMESPACE: notifications + OPENSHIFT_SERVER: https://api.paas.okd.cern.ch + NAMESPACE: notifications-main RESOURCE: notifications-routing stages: @@ -122,7 +122,7 @@ build_mr_image: allow_failure: true - when: never -tag_mr_prod: +tag_mr_main: extends: .tag_image variables: CI_REGISTRY_TAG: $CI_COMMIT_REF_SLUG @@ -133,9 +133,9 @@ tag_mr_prod: allow_failure: true - when: never environment: - name: prod + name: main -import_mr_prod: +import_mr_main: extends: .import_image variables: TAG: $CI_COMMIT_REF_SLUG @@ -145,7 +145,7 @@ import_mr_prod: allow_failure: true - when: never environment: - name: prod + name: main ###################################################### #################### Master branch ################### @@ -159,7 +159,7 @@ build_master_image: - if: $CI_COMMIT_BRANCH == 'master' - when: never -tag_image_prod: +tag_image_main: extends: .tag_image variables: CI_REGISTRY_TAG: master @@ -168,9 +168,9 @@ tag_image_prod: - if: $CI_COMMIT_BRANCH == 'master' - when: never environment: - name: prod + name: main -import_image_prod: +import_image_main: extends: .import_image variables: TAG: master @@ -178,7 +178,7 @@ import_image_prod: - if: $CI_COMMIT_BRANCH == 'master' - when: never environment: - name: prod + name: main ###################################################### #################### Tags ############################ @@ -201,7 +201,7 @@ tag_tagged_image: - if: $CI_COMMIT_TAG - when: never environment: - name: prod + name: main import_tagged_image: extends: .import_image @@ -211,4 +211,4 @@ import_tagged_image: - if: $CI_COMMIT_TAG - when: never environment: - name: prod + name: main -- GitLab