diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yml | 11 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 26 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 94 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-upload-artifact.sh | 4 |
7 files changed, 100 insertions, 55 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index acc0550fb..5f8d067d0 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -84,9 +84,6 @@ pattern: 'lib/**' - compare-type: ANT pattern: 'config/**' - forbidden-file-paths: - - compare-type: ANT - pattern: 'docs/**' properties: - build-blocker: @@ -160,16 +157,16 @@ git-revision: false block: true - trigger-builds: - - project: 'functest-apex-opnfv-jump-1-daily-{stream}' - predefined-parameters: - DEPLOY_SCENARIO={scenario} + - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' block: true block-thresholds: build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' - trigger-builds: - - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}' + - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO={scenario} block: true block-thresholds: build-step-failure-threshold: 'never' diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index a4be24ec0..5564d6989 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -168,11 +168,9 @@ builders: - shell: - !include-raw: ./compass-workspace-precleanup.sh + !include-raw-escape: ./compass-download-artifact.sh - shell: - !include-raw: ./compass-download-artifact.sh - - shell: - !include-raw: ./compass-deploy.sh + !include-raw-escape: ./compass-deploy.sh publishers: - archive: diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 697a1d573..860f5da1b 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -6,24 +6,38 @@ echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. Th echo "--------------------------------------------------------" echo +# source the properties file so we get OPNFV vars +source $BUILD_DIRECTORY/latest.properties + +# echo the info about artifact that is used during the deployment +echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment" + +if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then + # for none-merge deployments + # checkout the commit that was used for building the downloaded artifact + # to make sure the ISO and deployment mechanism uses same versions + echo "Checking out $OPNFV_GIT_SHA1" + git checkout $OPNFV_GIT_SHA1 --quiet +fi + echo 1 > /proc/sys/vm/drop_caches export CONFDIR=$WORKSPACE/deploy/conf export ISO_URL=file://$BUILD_DIRECTORY/compass.iso if [[ "$NODE_NAME" =~ "-vm" ]]; then export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml - export DHA_CONF=$CONFDIR/vm_environment/${{DEPLOY_SCENARIO}}.yml + export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml else export INSTALL_NIC=eth1 export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml - export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${{DEPLOY_SCENARIO}}.yml + export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml fi cd $WORKSPACE -export OS_VERSION=${{COMPASS_OS_VERSION}} -export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha ${{DHA_CONF}} --network ${{NETWORK_CONF}} +export OS_VERSION=${COMPASS_OS_VERSION} +export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION} +./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF} if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 @@ -34,6 +48,6 @@ echo "--------------------------------------------------------" echo "Done!" ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -sshpass -p root scp 2>/dev/null $ssh_options root@${{INSTALLER_IP}}:/var/ansible/run/openstack_${{COMPASS_OPENSTACK_VERSION}}-opnfv2/ansible.log ./ &> /dev/null +sshpass -p root scp 2>/dev/null $ssh_options root@${INSTALLER_IP}:/var/ansible/run/openstack_${COMPASS_OPENSTACK_VERSION}-opnfv2/ansible.log ./ &> /dev/null exit $deploy_ret diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 8943afb37..11e1d5f8a 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -116,9 +116,9 @@ builders: - shell: - !include-raw: ./compass-build.sh + !include-raw-escape: ./compass-build.sh - shell: - !include-raw: ./compass-deploy.sh + !include-raw-escape: ./compass-deploy.sh publishers: - archive: @@ -157,11 +157,11 @@ builders: - shell: - !include-raw: ./compass-build.sh + !include-raw-escape: ./compass-build.sh - shell: - !include-raw: ./compass-upload-artifact.sh + !include-raw-escape: ./compass-upload-artifact.sh - shell: - !include-raw: ./compass-workspace-cleanup.sh + !include-raw-escape: ./compass-workspace-cleanup.sh - job-template: name: 'compass-build-ppa-{stream}' @@ -194,7 +194,7 @@ builders: - shell: - !include-raw: ./compass-makeppa.sh + !include-raw-escape: ./compass-makeppa.sh diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 33c54eced..29a720263 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -28,8 +28,8 @@ <<: *brahmaputra - ericsson-pod1: <<: *brahmaputra - - ericsson-pod2: - <<: *brahmaputra +# - ericsson-pod2: +# <<: *brahmaputra - virtual: <<: *brahmaputra #-------------------------------- @@ -46,23 +46,22 @@ #-------------------------------- scenario: # HA scenarios - - 'os-onos-nofeature-ha': -# auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-odl_l2-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-odl_l3-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-odl_l2-bgpvpn-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-nosdn-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-onos-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-nosdn-kvm-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-nosdn-ovs-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-nosdn-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-odl_l2-bgpvpn-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm_ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-nosdn-ovs-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' # NOHA scenarios @@ -226,21 +225,39 @@ ######################## # trigger macros ######################## -# os-onos3-nofeature-ha trigger +# os-nosdn-nofeature-ha trigger - trigger: - name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger' + name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-trigger' triggers: - - timed: '0 20 * * *' + - timed: '0 2 * * *' - trigger: - name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger' + name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger' + name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-trigger' + triggers: + - timed: '0 2 * * *' +- trigger: + name: 'fuel-os-nosdn-nofeature-ha-virtual-trigger' triggers: - timed: '' + +# os-nosdn-kvm-ha trigger - trigger: - name: 'fuel-os-onos-nofeature-ha-virtual-trigger' + name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 6 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-trigger' + triggers: + - timed: '0 6 * * *' +- trigger: + name: 'fuel-os-nosdn-kvm-ha-virtual-trigger' triggers: - timed: '' @@ -248,7 +265,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger' triggers: - - timed: '0 0 * * *' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger' triggers: @@ -256,7 +273,7 @@ - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger' triggers: - - timed: '' + - timed: '0 10 * * *' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger' triggers: @@ -266,7 +283,7 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-trigger' triggers: - - timed: '0 4 * * *' + - timed: '0 14 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-trigger' triggers: @@ -274,26 +291,45 @@ - trigger: name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-trigger' triggers: - - timed: '' + - timed: '0 14 * * *' - trigger: name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger' triggers: - timed: '' -# os-odl_l2-bgpvpn-ha trigger +# os-onos-nofeature-ha trigger - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger' + name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger' triggers: - - timed: '0 8 * * *' + - timed: '0 18 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger' + name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger' + name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger' + triggers: + - timed: '0 18 * * *' +- trigger: + name: 'fuel-os-onos-nofeature-ha-virtual-trigger' triggers: - timed: '' + + +# os-nosdn-ovs-ha trigger +- trigger: + name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 22 * * *' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-trigger' + triggers: + - timed: '0 22 * * *' - trigger: - name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger' + name: 'fuel-os-nosdn-ovs-ha-virtual-trigger' triggers: - timed: '' diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index ceac859dd..d78ddc5ba 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -36,7 +36,7 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then ISOSTORE="/iso_mount/opnfv_ci/${GIT_BRANCH##*/}" if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then echo "ISO exists locally. Skipping the download and using the file from ISO store" - /bin/cp -f $ISOSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso + ln -s $ISOSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso echo "--------------------------------------------------------" echo ls -al $WORKSPACE/opnfv.iso diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index 6dd5f34d6..47cf8985c 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -29,17 +29,17 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then ls -tp | grep -v '/' | tail -n +6 | xargs -d '\n' /bin/rm -f -- # store ISO - echo "Storing $INSTALLER_TYPE artifact on NFS first" + echo "Storing $INSTALLER_TYPE artifact on NFS..." /bin/cp -f $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \ $ISOSTORE/opnfv-$OPNFV_ARTIFACT_VERSION.iso fi fi # log info to console -echo echo "Uploading $INSTALLER_TYPE artifact. This could take some time..." echo +cd $WORKSPACE # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \ gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 |