diff options
| -rw-r--r-- | jjb/apex/apex.yml | 36 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-build.sh | 4 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 111 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-virtual.sh | 26 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh (renamed from jjb/compass4nfv/compass-deploy-bare.sh) | 13 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 119 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 141 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 4 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 48 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-upload-artifact.sh | 8 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 18 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 74 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 8 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 4 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 133 | ||||
| -rwxr-xr-x | utils/docs-build.sh | 4 | ||||
| -rw-r--r-- | utils/test/result_collection_api/dashboard/qtip2Dashboard.py | 4 |
18 files changed, 471 insertions, 288 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index a1b922c5d..2719b3a47 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -109,6 +109,12 @@ BUILD_DIRECTORY=apex-verify-master/build_output git-revision: false block: true + - trigger-builds: + - project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-verify-master/build_output + git-revision: false + block: true - 'apex-workspace-cleanup' - job-template: @@ -378,6 +384,28 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}' + predefined-parameters: + BUILD_DIRECTORY=apex-build-master/build_output + git-revision: true + block: true + - trigger-builds: + - project: 'functest-apex-opnfv-jump-1-daily-{stream}' + predefined-parameters: + DEPLOY_SCENARIO=os-odl_l3-nofeature-ha + 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}' + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' ######################## # parameter macros @@ -493,12 +521,12 @@ gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 RPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) RPM_LIST=$RPM_INSTALL_PATH - for pkg in common undercloud; do + for pkg in common undercloud opendaylight-sfc; do RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" done SRPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) SRPM_LIST=$SRPM_INSTALL_PATH - for pkg in common undercloud; do + for pkg in common undercloud opendaylight-sfc; do SRPM_LIST+=" ${SRPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}" done for artifact in $RPM_LIST $SRPM_LIST; do @@ -591,7 +619,7 @@ if [ -n "$DEPLOY_SCENARIO" ]; then echo "Deploy Scenario set to ${DEPLOY_SCENARIO}" if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then - sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml + sudo opnfv-deploy -v -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml -n /etc/opnfv-apex/network_settings.yaml --debug else echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml" exit 1 @@ -678,7 +706,7 @@ if [ -e /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml ]; then sudo opnfv-deploy -i /root/inventory/pod_settings.yaml \ -d /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml \ - -n /root/network/network_settings.yaml + -n /root/network/network_settings.yaml --debug else echo "File does not exist /etc/opnfv-apex/${DEPLOY_SCENARIO}.yaml" exit 1 diff --git a/jjb/compass4nfv/compass-build.sh b/jjb/compass4nfv/compass-build.sh index 85b3ab47d..d08c39c51 100644 --- a/jjb/compass4nfv/compass-build.sh +++ b/jjb/compass4nfv/compass-build.sh @@ -2,6 +2,7 @@ set -o errexit set -o nounset set -o pipefail +set -x # log info to console echo "Starting the build of $INSTALLER_TYPE. This could take some time..." @@ -14,6 +15,7 @@ echo # set OPNFV_ARTIFACT_VERSION export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") +export PACKAGE_URL=$PPA_REPO # start the build if [ -d $PPA_CACHE ] @@ -38,4 +40,4 @@ ls -al $BUILD_DIRECTORY ) > $BUILD_DIRECTORY/opnfv.properties echo echo "--------------------------------------------------------" -echo "Done!"
\ No newline at end of file +echo "Done!" diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index 64a4b317c..2a8248186 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -24,11 +24,15 @@ #-------------------------------- - huawei-us-deploy-bare-1: <<: *brahmaputra + - huawei-virtual: + <<: *brahmaputra #-------------------------------- # master #-------------------------------- - intel-pod8: <<: *master + - huawei-virtual: + <<: *master scenario: - 'os-nosdn-nofeature-ha': @@ -40,9 +44,9 @@ - 'os-onos-nofeature-ha': disabled: false auto-trigger-name: 'compass-{scenario}-{pod}-trigger' -# - 'os-ocl-nofeature-ha': -# disabled: true -# auto-trigger-name: 'compass-{scenario}-{pod}-trigger' + - 'os-ocl-nofeature-ha': + disabled: false + auto-trigger-name: 'compass-{scenario}-{pod}-trigger' jobs: - 'compass-{scenario}-{pod}-daily-{stream}' @@ -54,8 +58,6 @@ - job-template: name: 'compass-{scenario}-{pod}-daily-{stream}' - project-type: multijob - node: huawei-build concurrent: false @@ -73,6 +75,9 @@ wrappers: - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + - timeout: + timeout: 360 + fail: true parameters: - project-parameter: @@ -83,37 +88,42 @@ - string: name: DEPLOY_SCENARIO default: '{scenario}' - - 'huawei-build-defaults' + - '{pod}-defaults' - '{installer}-defaults' triggers: - '{auto-trigger-name}' builders: - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'compass-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: FAILURE - - multijob: - name: functest - condition: COMPLETED - projects: - - name: 'functest-compass-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER - - multijob: - name: yardstick - condition: COMPLETED - projects: - - name: 'yardstick-compass-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER + - trigger-builds: + - project: 'compass-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'functest-compass-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-compass-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'compass-deploy-{pod}-daily-{stream}' @@ -162,7 +172,7 @@ - shell: !include-raw: ./compass-download-artifact.sh - shell: - !include-raw: ./compass-deploy-bare.sh + !include-raw: ./compass-deploy.sh publishers: - archive: @@ -181,19 +191,9 @@ default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - string: - name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$PROJECT - description: "Directory where the cache to be used during the build is located." - - string: name: GS_URL default: '$GS_BASE{gs-pathname}' description: "URL to Google Storage." - - string: - name: PPA_REPO - default: "http://205.177.226.235:9999" - - string: - name: PPA_CACHE - default: "$WORKSPACE/work/repo/" - choice: name: COMPASS_OPENSTACK_VERSION choices: @@ -204,7 +204,16 @@ choices: - 'trusty' - 'centos7' - +- parameter: + name: 'huawei-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'huawei-deploy-vm' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on these Jenkins Slaves' ######################## # trigger macros ######################## @@ -231,7 +240,7 @@ - trigger: name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger' triggers: - - timed: '0 16 * * *' + - timed: '' - trigger: name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger' triggers: @@ -240,3 +249,19 @@ name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger' triggers: - timed: '' +- trigger: + name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '' +- trigger: + name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '0 16 * * *' +- trigger: + name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '0 16 * * *' +- trigger: + name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger' + triggers: + - timed: '' diff --git a/jjb/compass4nfv/compass-deploy-virtual.sh b/jjb/compass4nfv/compass-deploy-virtual.sh deleted file mode 100644 index 4991350a0..000000000 --- a/jjb/compass4nfv/compass-deploy-virtual.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -x - -# log info to console -echo "Starting the deployment on virtual environment using $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -export OS_VERSION=${{COMPASS_OS_VERSION}} -export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -export CONFDIR=$WORKSPACE/deploy/conf/vm_environment -./deploy.sh --dha $CONFDIR/$DEPLOY_SCENARIO.yml --network $CONFDIR/$NODE_NAME/network.yml -if [ $? -ne 0 ]; then - echo "depolyment failed!" - deploy_ret=1 -fi - -echo -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 - -exit $deploy_ret diff --git a/jjb/compass4nfv/compass-deploy-bare.sh b/jjb/compass4nfv/compass-deploy.sh index dc0aeb29d..be15f8817 100644 --- a/jjb/compass4nfv/compass-deploy-bare.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -6,15 +6,22 @@ echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. Th echo "--------------------------------------------------------" echo -export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/$NODE_NAME +export CONFDIR=$WORKSPACE/deploy/conf export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -export INSTALL_NIC=eth0 +if [[ "$NODE_NAME" =~ "-vm" ]]; then + export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.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 +fi cd $WORKSPACE export OS_VERSION=${{COMPASS_OS_VERSION}} export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha $CONFDIR/${{DEPLOY_SCENARIO}}.yml --network $CONFDIR/network.yml +./deploy.sh --dha ${{DHA_CONF}} --network ${{NETWORK_CONF}} if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 565aaa33f..02e91028c 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -15,26 +15,11 @@ gs-pathname: '/{stream}' - scenario: - - 'os-nosdn-nofeature-ha': - disabled: false - node: huawei-deploy-vm - - 'os-odl_l2-nofeature-ha': - disabled: false - node: huawei-deploy-vm - - 'os-onos-nofeature-ha': - disabled: false - node: huawei-deploy-vm -# - 'os-ocl-nofeature-ha': -# disabled: true -# node: huawei-deploy-vm - jobs: - 'compass-verify-{stream}' - 'compass-build-iso-{stream}' - 'compass-build-ppa-{stream}' - - 'compass-deploy-virtual-{scenario}-{stream}' - - 'compass-virtual-daily-{stream}' + ######################## # job templates @@ -48,10 +33,15 @@ concurrent: true + wrappers: + - timeout: + timeout: 120 + fail: true + properties: - throttle: enabled: true - max-total: 3 + max-total: 1 max-per-node: 1 parameters: @@ -100,7 +90,7 @@ - shell: !include-raw: ./compass-build.sh - shell: - !include-raw: ./compass-deploy-virtual.sh + !include-raw: ./compass-deploy.sh publishers: - archive: @@ -109,9 +99,9 @@ fingerprint: true - job-template: - name: 'compass-virtual-daily-{stream}' + name: 'compass-build-iso-{stream}' - node: huawei-build + node: ericsson-build concurrent: true @@ -140,52 +130,6 @@ - timed: 'H 14 * * *' builders: - - trigger-builds: - - project: 'compass-build-iso-{stream}' - git-revision: true - block: true - - trigger-builds: - - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}' - git-revision: true - block: false - - trigger-builds: - - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}' - git-revision: true - block: false - - trigger-builds: - - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}' - git-revision: true - block: false - -- job-template: - name: 'compass-build-iso-{stream}' - - node: ericsson-build - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - - parameters: - - project-parameter: - project: '{project}' - - compass-project-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - '{node}-defaults' - - '{installer}-defaults' - - scm: - - git-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - branch: '{branch}' - - builders: - shell: !include-raw: ./compass-build.sh - shell: @@ -226,46 +170,7 @@ - shell: !include-raw: ./compass-makeppa.sh -- job-template: - name: 'compass-deploy-virtual-{scenario}-{stream}' - - disabled: false - - node: '{node}' - - concurrent: true - - properties: - - throttle: - enabled: true - max-total: 1 - max-per-node: 1 - parameters: - - project-parameter: - project: '{project}' - - compass-project-parameter: - installer: '{installer}' - gs-pathname: '{gs-pathname}' - - string: - name: DEPLOY_SCENARIO - default: '{scenario}' - - '{node}-defaults' - - '{installer}-defaults' - - builders: - - shell: - !include-raw: ./compass-workspace-precleanup.sh - - shell: - !include-raw: ./compass-download-artifact.sh - - shell: - !include-raw: ./compass-deploy-virtual.sh - - publishers: - - archive: - artifacts: 'ansible.log' - allow-empty: 'true' - fingerprint: true ######################## # parameter macros @@ -279,7 +184,7 @@ description: "Directory where the build artifact will be located upon the completion of the build." - string: name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$PROJECT + default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}" description: "Directory where the cache to be used during the build is located." - string: name: GS_URL @@ -287,7 +192,7 @@ description: "URL to Google Storage." - string: name: PPA_REPO - default: "http://205.177.226.235:9999" + default: "http://205.177.226.237:9999{gs-pathname}" - string: name: PPA_CACHE default: "$WORKSPACE/work/repo/" diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 50e45a41e..d293554c2 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -40,16 +40,18 @@ - virtual: <<: *master #-------------------------------- - -# new scenario descriptions +# scenarios +#-------------------------------- scenario: # HA scenarios + - 'os-onos-nofeature-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-odl_l2-nofeature-ha': auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-odl_l3-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - - 'os-onos-nofeature-ha': - auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + - 'os-odl_l2-bgpvpn-ha': + auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' - 'os-nosdn-nofeature-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-kvm-ha': @@ -59,7 +61,7 @@ - 'os-nosdn-ovs-ha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' - 'os-nosdn-vlan-ha': - auto-trigger-name: 'fuel-{scenario}-{pod}-trigger' + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' # NOHA scenarios - 'os-odl_l2-nofeature-noha': auto-trigger-name: 'brahmaputra-trigger-daily-disabled' @@ -88,10 +90,6 @@ - job-template: name: 'fuel-{scenario}-{pod}-daily-{stream}' - project-type: multijob - - node: intel-build - concurrent: false properties: @@ -115,6 +113,8 @@ - project-parameter: project: '{project}' - '{installer}-defaults' + - '{pod}-defaults': + installer: '{installer}' - string: name: DEPLOY_SCENARIO default: '{scenario}' @@ -122,30 +122,35 @@ gs-pathname: '{gs-pathname}' builders: - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'fuel-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: FAILURE - - multijob: - name: functest - condition: COMPLETED - projects: - - name: 'functest-fuel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER - - multijob: - name: yardstick - condition: COMPLETED - projects: - - name: 'yardstick-fuel-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER + - trigger-builds: + - project: 'fuel-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'functest-fuel-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-fuel-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'fuel-deploy-{pod}-daily-{stream}' @@ -165,8 +170,9 @@ parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' - '{installer}-defaults' + - '{pod}-defaults': + installer: '{installer}' - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' @@ -211,48 +217,77 @@ name: GS_URL default: artifacts.opnfv.org/$PROJECT{gs-pathname} description: "URL to Google Storage." -- parameter: - name: 'virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'fuel-deploy-virtual' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on these Jenkins Slaves' ######################## # trigger macros ######################## +# os-onos3-nofeature-ha trigger +- trigger: + name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 20 * * *' +- trigger: + name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-onos-nofeature-ha-virtual-trigger' + triggers: + - timed: '' + +# os-odl_l2-nofeature-ha trigger - trigger: name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger' triggers: - - timed: '0 2 * * *' + - timed: '0 0 * * *' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger' triggers: - - timed: '0 2 * * *' + - timed: '' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger' triggers: - - timed: '0 2 * * *' + - timed: '' - trigger: name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger' triggers: - timed: '' + +# os-odl_l3-nofeature-ha trigger +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 4 * * *' - trigger: - name: 'fuel-os-nosdn-vlan-ha-opnfv-jump-2-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vlan-ha-ericsson-pod1-trigger' + name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-trigger' triggers: - - timed: '0 2 * * *' + - timed: '' +- trigger: + name: 'fuel-os-odl_l3-nofeature-ha-virtual-trigger' + triggers: + - timed: '' + +# os-odl_l2-bgpvpn-ha trigger +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 8 * * *' +- trigger: + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod1-trigger' + triggers: + - timed: '' - trigger: - name: 'fuel-os-nosdn-vlan-ha-ericsson-pod2-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-trigger' triggers: - timed: '' - trigger: - name: 'fuel-os-nosdn-vlan-ha-virtual-trigger' + name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-trigger' triggers: - timed: '' diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index b0a1c78f1..f3d2aca45 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -53,8 +53,8 @@ chmod a+x $TMPDIR # clone the securedlab repo cd $WORKSPACE -echo "Cloning securedlab repo" -git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet +echo "Cloning securedlab repo ${GIT_BRANCH##origin/}" +git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet --branch ${GIT_BRANCH##origin/} # construct the command DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso -H -B $BRIDGE -S $TMPDIR" diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index cedb4eee2..2e30fb1e6 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -123,6 +123,16 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'ci/**' + - compare-type: ANT + pattern: 'build/**' + - compare-type: ANT + pattern: 'deploy/**' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' readable-message: true builders: @@ -175,6 +185,16 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'ci/**' + - compare-type: ANT + pattern: 'build/**' + - compare-type: ANT + pattern: 'deploy/**' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' builders: - shell: @@ -189,6 +209,8 @@ concurrent: true + disabled: false + properties: - throttle: enabled: true @@ -197,14 +219,17 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-deploy-virtual-daily-.*' + - 'fuel-os-.*?-virtual-daily-.*' + - 'fuel-merge-deploy-virtual-.*' + block-level: 'NODE' parameters: - project-parameter: project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'fuel-deploy-virtual-defaults' + - 'virtual-defaults': + installer: '{installer}' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' @@ -230,6 +255,16 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'ci/**' + - compare-type: ANT + pattern: 'build/**' + - compare-type: ANT + pattern: 'deploy/**' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' dependency-jobs: 'fuel-merge-build-{stream}' builders: @@ -256,12 +291,19 @@ enabled: true max-total: 1 max-per-node: 1 + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'fuel-os-.*?-ericsson-pod2-daily-{stream}' parameters: - project-parameter: project: '{project}' - 'ericsson-pod2-defaults' - '{installer}-defaults' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' - fuel-project-parameter: gs-pathname: '{gs-pathname}' @@ -273,7 +315,7 @@ wrappers: - build-name: - name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + name: '$BUILD_NUMBER - POD: $NODE_NAME Scenario: $DEPLOY_SCENARIO' builders: - shell: diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh index fa695e6b0..8b69f5a78 100755 --- a/jjb/fuel/fuel-upload-artifact.sh +++ b/jjb/fuel/fuel-upload-artifact.sh @@ -11,8 +11,8 @@ if [ -f $WORKSPACE/.noupload ]; then fi # log info to console +echo echo "Uploading the $INSTALLER_TYPE artifact. This could take some time..." -echo "--------------------------------------------------------" echo # source the opnfv.properties to get ARTIFACT_VERSION @@ -39,7 +39,11 @@ gsutil -m setmeta \ -h "Cache-Control:private, max-age=0, no-transform" \ gs://$GS_URL/*.iso > /dev/null 2>&1 +echo "Done!" echo echo "--------------------------------------------------------" -echo "Done!" +echo echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" +echo +echo "--------------------------------------------------------" +echo diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 6c33bd0a5..42dd6df17 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -35,6 +35,15 @@ - ericsson-pod1: installer: fuel <<: *brahmaputra + - virtual: + installer: fuel + <<: *brahmaputra + - virtual: + installer: compass + <<: *brahmaputra + - virtual: + installer: joid + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -59,6 +68,15 @@ - orange-pod2: installer: joid <<: *master + - virtual: + installer: fuel + <<: *master + - virtual: + installer: compass + <<: *master + - virtual: + installer: joid + <<: *master #-------------------------------- testsuite: diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index 9bb3265f2..849112319 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -28,6 +28,8 @@ pod: - intel-pod5: <<: *brahmaputra + - virtual: + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -37,6 +39,8 @@ <<: *master - juniper-pod1: <<: *master + - virtual: + <<: *master #-------------------------------- # new scenario descriptions scenario: @@ -67,10 +71,6 @@ - job-template: name: 'joid-{scenario}-{pod}-daily-{stream}' - project-type: multijob - - node: intel-build - concurrent: false properties: @@ -94,35 +94,42 @@ - project-parameter: project: '{project}' - '{installer}-defaults' + - '{pod}-defaults': + installer: '{installer}' - string: name: DEPLOY_SCENARIO default: '{scenario}' builders: - - multijob: - name: deploy - condition: SUCCESSFUL - projects: - - name: 'joid-deploy-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: FAILURE - - multijob: - name: functest - condition: COMPLETED - projects: - - name: 'functest-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER - - multijob: - name: yardstick - condition: COMPLETED - projects: - - name: 'yardstick-joid-{pod}-daily-{stream}' - current-parameters: false - predefined-parameters: 'DEPLOY_SCENARIO={scenario}' - kill-phase-on: NEVER + - trigger-builds: + - project: 'joid-deploy-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + - trigger-builds: + - project: 'functest-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' + - trigger-builds: + - project: 'yardstick-joid-{pod}-daily-{stream}' + current-parameters: false + predefined-parameters: + DEPLOY_SCENARIO={scenario} + block: true + same-node: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'FAILURE' - job-template: name: 'joid-deploy-{pod}-daily-{stream}' @@ -150,7 +157,11 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults' + - '{pod}-defaults': + installer: '{installer}' + - string: + name: DEPLOY_SCENARIO + default: 'os-odl_l2-nofeature-ha' scm: - git-scm: @@ -160,7 +171,6 @@ builders: - 'builder-macro' - ######################## # builder macros ######################## @@ -196,3 +206,7 @@ name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger' triggers: - timed: '' +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger' + triggers: + - timed: '' diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index 991a2bc5a..747332cab 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -44,6 +44,8 @@ fi POD=orange-pod2 ;; juniper-us-test-1) POD=juniper-pod1 ;; + *virtual*) + POD=default ;; *) POD=$NODE_NAME ;; esac @@ -152,6 +154,8 @@ exit_on_error $? "Main deploy FAILED" JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------" KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip) +ODL_CONTROLLER=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //') +ODL_PASSWORD=admin # export the openrc file cat << EOF > $JOID_ADMIN_OPENRC @@ -160,6 +164,8 @@ export OS_PASSWORD=$OS_ADMIN_PASSWORD export OS_TENANT_NAME=admin export OS_AUTH_URL=http://$KEYSTONE:5000/v2.0 export OS_REGION_NAME=Canonical +export ODL_CONTROLLER=$ODL_CONTROLLER +export ODL_PASSWORD=$ODL_PASSWORD EOF ## @@ -199,6 +205,8 @@ exit_on_error $? "Deploy FAILED to auth to openstack" # If we have more information than only the name, try to create it if [ -z "$EXTNET_TYPE" ]; then echo "------ No data for external network creation, pass ------" +elif [[ "$DEPLOY_SCENARIO" =~ "onos" ]]; then + echo "------ ONOS have created the external network, pass ------" else echo "------ External network creation ------" neutron net-create $EXTNET_NAME --router:external True \ diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 884b8b070..296424344 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -53,7 +53,7 @@ projects: - project-compare-type: 'REG_EXP' #Left out arno projects oscar|octopus|functest|genesis - project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' @@ -91,7 +91,7 @@ comment-contains-value: 'remerge' projects: - project-compare-type: 'REG_EXP' - project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|octopus|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|cperf|functest' branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index c6078c613..20387f24f 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -422,11 +422,11 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'fuel-deploy-virtual-defaults' + name: 'virtual-defaults' parameters: - label: name: SLAVE_LABEL - default: 'fuel-deploy-virtual' + default: '{installer}-deploy-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index e07856c31..8899baf15 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -25,55 +25,93 @@ pod: - opnfv-jump-1: installer: apex + suite: daily <<: *brahmaputra - opnfv-jump-2: installer: fuel + suite: daily <<: *brahmaputra - intel-pod5: installer: joid + suite: daily <<: *brahmaputra - huawei-us-deploy-bare-1: installer: compass + suite: daily <<: *brahmaputra - ericsson-pod1: installer: fuel + suite: daily + <<: *brahmaputra + - virtual: + installer: fuel + suite: daily + <<: *brahmaputra + - virtual: + installer: compass + suite: daily + <<: *brahmaputra + - virtual: + installer: joid + suite: daily <<: *brahmaputra #-------------------------------- # master #-------------------------------- - ericsson-pod1: installer: fuel + suite: daily + <<: *master + - ericsson-pod1: + installer: fuel + suite: vtcdaily <<: *master - ericsson-pod2: installer: fuel + suite: daily <<: *master - intel-pod6: installer: joid + suite: daily <<: *master - intel-pod8: installer: compass + suite: daily <<: *master - zte-build-1: installer: fuel + suite: daily <<: *master - orange-pod2: installer: joid + suite: daily <<: *master - opnfv-jump-1: installer: apex + suite: daily + <<: *master + - virtual: + installer: fuel + suite: daily + <<: *master + - virtual: + installer: compass + suite: daily + <<: *master + - virtual: + installer: joid + suite: daily <<: *master #-------------------------------- - loop: - - daily jobs: - - 'yardstick-{installer}-{pod}-{loop}-{stream}' + - 'yardstick-{installer}-{pod}-{suite}-{stream}' ################################ # job templates ################################ - job-template: - name: 'yardstick-{installer}-{pod}-{loop}-{stream}' + name: 'yardstick-{installer}-{pod}-{suite}-{stream}' disabled: false @@ -81,6 +119,9 @@ - build-name: name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO' + triggers: + - 'yardstick-{pod}-trigger' + parameters: - project-parameter: project: '{project}' @@ -92,7 +133,7 @@ default: 'os-odl_l2-nofeature-ha' - string: name: YARDSTICK_SUITE_NAME - default: opnfv_${{NODE_NAME}}_{loop}.yaml + default: opnfv_${{NODE_NAME}}_{suite}.yaml description: 'Path to test suite' - string: name: CI_DEBUG @@ -108,7 +149,7 @@ builders: - 'yardstick-cleanup' #- 'yardstick-fetch-os-creds' - - 'yardstick-daily' + - 'yardstick-{suite}' publishers: - email: @@ -163,6 +204,17 @@ echo "Yardstick: done!" - builder: + name: yardstick-vtcdaily + builders: + - shell: | + #!/bin/bash + set -e + [[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null" + + cd $WORKSPACE + ./ci/apexlake-verify + +- builder: name: yardstick-fetch-os-creds builders: - shell: @@ -236,6 +288,7 @@ name: YARDSTICK_DB_BACKEND default: '-i 10.118.36.90:8086' description: 'Arguments to use in order to choose the backend DB' + - parameter: name: 'yardstick-params-opnfv-jump-1' parameters: @@ -243,6 +296,7 @@ name: YARDSTICK_DB_BACKEND default: '-r 213.77.62.197/results' description: 'Arguments to use in order to choose the backend DB' + - parameter: name: 'yardstick-params-opnfv-jump-2' parameters: @@ -274,3 +328,70 @@ name: YARDSTICK_DB_BACKEND default: '' description: 'Arguments to use in order to choose the backend DB' + +- parameter: + name: 'yardstick-params-virtual' + parameters: + - string: + name: YARDSTICK_DB_BACKEND + default: '' + description: 'Arguments to use in order to choose the backend DB' + +####################### +## trigger macros +####################### +# trigger for PODs to only run yardstick test suites +- trigger: + name: 'yardstick-zte-build-1-trigger' + triggers: + - timed: '0 2 * * *' + +- trigger: + name: 'yardstick-intel-pod5-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-intel-pod6-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-intel-pod8-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-ericsson-pod1-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-ericsson-pod2-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-opnfv-jump-1-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-opnfv-jump-2-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-huawei-us-deploy-bare-1-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-orange-pod2-trigger' + triggers: + - timed: '' + +- trigger: + name: 'yardstick-virtual-trigger' + triggers: + - timed: '' diff --git a/utils/docs-build.sh b/utils/docs-build.sh index b397094c6..39647a33d 100755 --- a/utils/docs-build.sh +++ b/utils/docs-build.sh @@ -49,8 +49,8 @@ function check_rst_doc() { # Note: This check may fail in many jobs for building project docs, since # the old sample has lines more than 120. We ignore failures on this # check right now, but these have to be fixed before OPNFV B release. - _out=$(doc8 --max-line-length 120 --ignore D000 "$_src") || { - _msg='Error: rst validatino (doc8) has failed, please fix the following error(s).' + _out=$(doc8 --max-line-length 240 --ignore D000 "$_src") || { + _msg='Warning: rst validation (doc8) has failed, please fix the following error(s).' _errs=$(echo "$_out" | sed -n -e "/^$_src/s/^/ /p") echo echo -e "$_msg\n$_errs" diff --git a/utils/test/result_collection_api/dashboard/qtip2Dashboard.py b/utils/test/result_collection_api/dashboard/qtip2Dashboard.py index 138244dd0..0112945b1 100644 --- a/utils/test/result_collection_api/dashboard/qtip2Dashboard.py +++ b/utils/test/result_collection_api/dashboard/qtip2Dashboard.py @@ -99,7 +99,7 @@ def _get_results(db_url, testcase): def _test(): - db_url = "http://213.77.62.197" + db_url = "http://testresults.opnfv.org/testapi" raw_result = defaultdict() raw_result = _get_results(db_url, {"project": "qtip", "testcase": "compute_test_suite"}) @@ -118,4 +118,4 @@ def _test(): print result if __name__ == '__main__': - _test()
\ No newline at end of file + _test() |