diff options
-rw-r--r-- | jjb/oom/oom-helm.yaml | 16 | ||||
-rw-r--r-- | jjb/sdc/sdc-dcae-d-csit.yaml | 19 |
2 files changed, 29 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} diff --git a/jjb/sdc/sdc-dcae-d-csit.yaml b/jjb/sdc/sdc-dcae-d-csit.yaml new file mode 100644 index 000000000..e828e27e6 --- /dev/null +++ b/jjb/sdc/sdc-dcae-d-csit.yaml @@ -0,0 +1,19 @@ +--- +- project: + name: sdc-dcae-d-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'sdc-dcae-d' + stream: + - 'master': + branch: 'master' + functionality: + - 'dcaed': + trigger_jobs: + - 'sdc-{stream}-docker-version-java-daily' + - '{project-name}-dt-be-main-{stream}-docker-version-java-daily' + - '{project-name}-dt-{stream}-docker-version-java-daily' + - '{project-name}-fe-{stream}-docker-version-java-daily' + - '{project-name}-tosca-lab-{stream}-docker-java-daily' + robot-options: '' |