diff options
Diffstat (limited to 'jjb')
-rwxr-xr-x | jjb/fuel/fuel-upload-artifact.sh | 38 | ||||
-rwxr-xr-x | jjb/functest/set-functest-env.sh | 5 | ||||
-rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 32 |
3 files changed, 72 insertions, 3 deletions
diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index 47cf8985c..1ccd3282c 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -19,6 +19,7 @@ fi # source the opnfv.properties to get ARTIFACT_VERSION source $WORKSPACE/opnfv.properties +nfsstore () { # storing ISOs for verify & merge jobs will be done once we get the disk array if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then # store ISO locally on NFS first @@ -34,7 +35,30 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then $ISOSTORE/opnfv-$OPNFV_ARTIFACT_VERSION.iso fi fi +} +importkey () { +# clone releng repository +echo "Cloning releng repository..." +[ -d releng ] && rm -rf releng +git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng/ &> /dev/null +#this is where we import the siging key +if [ -f $WORKSPACE/releng/utils/gpg_import_key.sh ]; then + source $WORKSPACE/releng/utils/gpg_import_key.sh +fi +} + +signiso () { +gpg2 -vvv --batch --yes --no-tty \ + --default-key opnfv-helpdesk@rt.linuxfoundation.org \ + --passphrase besteffort \ + --detach-sig $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso + +gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso.sig +echo "ISO signature Upload Complete!" +} + +uploadiso () { # log info to console echo "Uploading $INSTALLER_TYPE artifact. This could take some time..." echo @@ -80,3 +104,17 @@ echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" echo echo "--------------------------------------------------------" echo +} + +nfsstore + +if [[ ! "$JOB_NAME" =~ merge ]]; then + importkey + signiso + uploadiso +fi + +if [[ ! "$JOB_NAME" =~ verify ]]; then + uploadiso +fi + diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index d2e232de5..b7d745a79 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -41,10 +41,13 @@ if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FOR sudo iptables -I FORWARD -j RETURN fi +DEPLOY_TYPE=baremetal +[[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt + echo "Functest: Start Docker and prepare environment" envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ - -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG}" + -e BUILD_TAG=${BUILD_TAG} -e CI_DEBUG=${CI_DEBUG} -e DEPLOY_TYPE=${DEPLOY_TYPE}" branch=${GIT_BRANCH##*/} dir_result="${HOME}/opnfv/functest/results/${branch}" mkdir -p ${dir_result} diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 61c1f825e..ae03eab4a 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -70,7 +70,7 @@ - 'os-onos-nofeature-noha': auto-trigger-name: 'daily-trigger-disabled' - 'os-onos-sfc-ha': - auto-trigger-name: 'daily-trigger-disabled' + auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger' - 'os-ocl-nofeature-ha': auto-trigger-name: 'daily-trigger-disabled' - 'os-ocl-nofeature-noha': @@ -307,7 +307,19 @@ - trigger: name: 'joid-os-onos-sfc-ha-baremetal-master-trigger' triggers: - - timed: '0 21 * * *' + - timed: '0 22 * * *' +- trigger: + name: 'joid-os-onos-sfc-ha-virtual-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-orange-pod2-master-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-juniper-pod1-master-trigger' + triggers: + - timed: '' # os-onos-nofeature-ha trigger - branch: stable/brahmaputra - trigger: @@ -326,6 +338,22 @@ name: 'joid-os-onos-nofeature-ha-juniper-pod1-brahmaputra-trigger' triggers: - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-baremetal-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-virtual-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-orange-pod2-brahmaputra-trigger' + triggers: + - timed: '' +- trigger: + name: 'joid-os-onos-sfc-ha-juniper-pod1-brahmaputra-trigger' + triggers: + - timed: '' # os-nosdn-lxd-noha trigger - branch: master - trigger: |