diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/doctor/doctor.yml | 12 | ||||
| -rw-r--r-- | jjb/infra/infra-daily-jobs.yml | 4 | ||||
| -rwxr-xr-x | jjb/infra/openstack-bifrost-verify.sh | 12 | ||||
| -rwxr-xr-x | jjb/kvmfornfv/kvmfornfv-download-artifact.sh | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 5 |
5 files changed, 29 insertions, 6 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index ead6c00a1..b53082eb5 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -92,7 +92,9 @@ description: 'OpenStack credentials' - '{installer}-defaults' - '{slave-label}-defaults' - - 'functest-suite-parameter' + - 'functest-suite-parameter': + FUNCTEST_SUITE_NAME: '{project}' + TESTCASE_OPTIONS: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/{project}' - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' @@ -130,7 +132,11 @@ file-paths: - compare-type: ANT pattern: 'tests/**' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true builders: - - 'functest-suite-builder': - TESTCASE_OPTIONS: '-e INSPECTOR_TYPE=$INSPECTOR_TYPE -v $WORKSPACE:$HOME/opnfv/repos/doctor' + - 'functest-suite-builder' diff --git a/jjb/infra/infra-daily-jobs.yml b/jjb/infra/infra-daily-jobs.yml index df90c6d13..d779d56d5 100644 --- a/jjb/infra/infra-daily-jobs.yml +++ b/jjb/infra/infra-daily-jobs.yml @@ -156,11 +156,11 @@ - shell: | #!/bin/bash - echo "Not activated!" + sudo $WORKSPACE/jjb/infra/infra-deploy.sh - builder: name: 'infra-smoketest-daily-builder' builders: - shell: | #!/bin/bash - echo "Not activated!" + sudo $WORKSPACE/jjb/infra/infra-smoketest.sh diff --git a/jjb/infra/openstack-bifrost-verify.sh b/jjb/infra/openstack-bifrost-verify.sh index a4653f921..c17cb8861 100755 --- a/jjb/infra/openstack-bifrost-verify.sh +++ b/jjb/infra/openstack-bifrost-verify.sh @@ -11,6 +11,16 @@ set -o errexit set -o nounset set -o pipefail +trap fix_ownership EXIT + +function fix_ownership() { + if [ -z "${JOB_URL+x}" ]; then + echo "Not running as part of Jenkins. Handle the logs manually." + else + chown -R jenkins:jenkins $WORKSPACE + fi +} + # check distro to see if we support it # we will have centos and suse supported in future case "$DISTRO" in @@ -24,7 +34,7 @@ case "$DISTRO" in esac # remove previously cloned repos -/bin/rm -rf /opt/bifrost /opt/puppet-infracloud /opt/releng +/bin/rm -rf /opt/bifrost /opt/puppet-infracloud /opt/stack /opt/releng # clone upstream bifrost repo and checkout the patch to verify git clone https://git.openstack.org/openstack/bifrost /opt/bifrost diff --git a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh index c8bdb9c72..ea37eb29c 100755 --- a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh +++ b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh @@ -27,8 +27,10 @@ case "$JOB_TYPE" in exit 1 esac +GS_GUESTIMAGE_LOCATION="gs://artifacts.opnfv.org/$PROJECT/guest-image" /bin/mkdir -p $WORKSPACE/build_output gsutil cp -r $GS_UPLOAD_LOCATION/* $WORKSPACE/build_output > $WORKSPACE/gsutil.log 2>&1 +gsutil cp $GS_GUESTIMAGE_LOCATION/guest1.sha512 $WORKSPACE/build_output > $WORKSPACE/gsutil.log 2>&1 echo "--------------------------------------------------------" ls -al $WORKSPACE/build_output diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 286ca6dbf..fb2d8f132 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -167,6 +167,11 @@ installer: fuel auto-trigger-name: 'daily-trigger-disabled' <<: *master + - arm-pod2: + slave-label: '{pod}' + installer: fuel + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado - orange-pod2: slave-label: '{pod}' installer: joid |