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 | ||||
-rwxr-xr-x | jjb/functest/functest-alpine.sh | 13 |
5 files changed, 25 insertions, 9 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/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index da167358a..e8d81ea0c 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -136,7 +136,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi" - envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES}" + envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}" fi if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then @@ -156,12 +156,15 @@ fi if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then - IMAGE_PROPERTIES="${IMAGE_PROPERTIES}, hw_mem_page_size: large" + IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" else - IMAGE_PROPERTIES="hw_mem_page_size: large" + IMAGE_PROPERTIES="hw_mem_page_size:large" fi - FLAVOR_EXTRA_SPECS="hw:mem_page_size: large" - envs="${envs} -e IMAGE_PROPERTIES=\"${IMAGE_PROPERTIES}\" -e FLAVOR_EXTRA_SPECS=\"${FLAVOR_EXTRA_SPECS}\"" + FLAVOR_EXTRA_SPECS="hw:mem_page_size:large" +fi + +if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then + envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}" fi volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" |