From ddb341690123bd1823c39d0f0bce8fe09d145bdf Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 26 Jun 2019 08:08:11 -0700 Subject: [PATCH] Allow staging images only on OOM staging branch Issue-ID: INT-1055 Signed-off-by: Gary Wu Change-Id: Idde622a1b4160f6f87b42e0252d902b5f3dd84d4 --- jjb/oom/oom-helm.yaml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 5a7d377a1..13886207c 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -12,17 +12,21 @@ #!/bin/bash set -e -o pipefail cd kubernetes/ - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 + if [ "$GERRIT_BRANCH" != "staging" ]; then + if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then + echo "[ERROR] Only release images are allowed in helm charts." + exit 1 + fi fi make all subproject_build_script: | #!/bin/bash cd kubernetes/ - if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then - echo "[ERROR] Only release images are allowed in helm charts." - exit 1 + if [ "$GERRIT_BRANCH" != "staging" ]; then + if grep -r -n -E ':\s*onap/.*:.*(STAGING|SNAPSHOT|latest).*'; then + echo "[ERROR] Only release images are allowed in helm charts." + exit 1 + fi fi make common make {subproject} -- 2.16.6