diff options
| m--------- | global-jjb | 0 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml | 8 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 8 | ||||
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 5 | ||||
| -rw-r--r-- | jjb/releng/compass4nfv-docker.yaml | 18 |
5 files changed, 26 insertions, 13 deletions
diff --git a/global-jjb b/global-jjb -Subproject 18bb0a40f9ba00fd8417b32fbde9593b6d968c5 +Subproject ddd8f4dd3b86b15eb45da9f5f65b16f890b7f60 diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 5a8f241b1..15fab23c6 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -885,7 +885,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: $GS_BASE{gs-pathname}/{os_version}/{topology} + default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION @@ -895,7 +895,10 @@ name: ODL_BRANCH default: '{odl_branch}' description: ODL branch being used - + - string: + name: FORCE_PROMOTE + default: 'False' + description: "Used to force promotion and skip CSIT" properties: - build-blocker: use-build-blocker: true @@ -955,6 +958,7 @@ SSH_KEY_PATH=/tmp/csit/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE node-parameters: true kill-phase-on: NEVER abort-all-job: false diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 908acb62c..5c934c44d 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -731,7 +731,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: $GS_BASE{gs-pathname}/{os_version}/{topology} + default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION @@ -741,7 +741,10 @@ name: ODL_BRANCH default: '{odl_branch}' description: ODL branch being used - + - string: + name: FORCE_PROMOTE + default: 'False' + description: "Used to force promotion and skip CSIT" properties: - build-blocker: use-build-blocker: true @@ -801,6 +804,7 @@ SSH_KEY_PATH=/tmp/csit/id_rsa ODL_CONTAINERIZED=true OS_VERSION=$OS_VERSION + SKIP_CSIT=$FORCE_PROMOTE node-parameters: true kill-phase-on: NEVER abort-all-job: false diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index abd62a39d..892f0aa7a 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -4,6 +4,11 @@ set -o errexit set -o nounset set -o pipefail +if [[ ! -z ${SKIP_CSIT+x} && "$SKIP_CSIT" == "True" ]]; then + echo "Skipping csit run" + exit 0 +fi + if [ "$OS_VERSION" == 'master' ]; then FULL_OS_VER='master' else diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml index 7cedba916..2eb2a207c 100644 --- a/jjb/releng/compass4nfv-docker.yaml +++ b/jjb/releng/compass4nfv-docker.yaml @@ -198,14 +198,16 @@ #!/bin/bash -ex case "{stream}" in "master") - tag="latest" ;; + sudo manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template opnfv/compass-{image}:ARCH-latest \ + --target opnfv/compass-{image}:latest ;; *) - tag="{stream}" ;; + sudo manifest-tool push from-args \ + --platforms linux/amd64,linux/arm64 \ + --template opnfv/compass-{image}:ARCH-stable \ + --target opnfv/compass-{image}:{stream} ;; esac - sudo manifest-tool push from-args \ - --platforms linux/amd64,linux/arm64 \ - --template opnfv/compass-{image}:ARCH-$tag \ - --target opnfv/compass-{image}:$tag exit $? # parameter macro @@ -256,9 +258,7 @@ publishers: - email: recipients: > - chigang@huawei.com - huangxiangyui5@huawei.com - xueyifei@huawei.com + huangxiangyu5@huawei.com wutianwei1@huawei.com - publisher: |