diff options
| -rw-r--r-- | jjb/apex/apex.yml | 7 | ||||
| -rw-r--r-- | jjb/bottlenecks/bottlenecks.yml | 2 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 6 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 18 | ||||
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 146 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 15 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 26 | ||||
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/kvmfornfv/kvmfornfv.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 2 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 2 | ||||
| -rw-r--r-- | jjb/qtip/qtip.yml | 2 | ||||
| -rw-r--r-- | jjb/releng-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick-ci-jobs.yml | 16 |
14 files changed, 105 insertions, 145 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 186c50203..d61f2a265 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -307,6 +307,13 @@ 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 diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index c29c5688b..26069cf7b 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -182,7 +182,7 @@ name: bottlenecks-fetch-os-creds builders: - shell: - !include-raw ../../utils/fetch_os_creds.sh + !include-raw: ../../utils/fetch_os_creds.sh - builder: name: bottlenecks-run-rubbos diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index f68597e3a..3acbf07f2 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -156,11 +156,11 @@ builders: - shell: - !include-raw ./compass-workspace-precleanup.sh + !include-raw: ./compass-workspace-precleanup.sh - shell: - !include-raw ./compass-download-artifact.sh + !include-raw: ./compass-download-artifact.sh - shell: - !include-raw ./compass-deploy-bare.sh + !include-raw: ./compass-deploy-bare.sh publishers: - archive: diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 1395fa532..63aeca06a 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -95,9 +95,9 @@ builders: - shell: - !include-raw ./compass-build.sh + !include-raw: ./compass-build.sh - shell: - !include-raw ./compass-deploy-virtual.sh + !include-raw: ./compass-deploy-virtual.sh publishers: - archive: @@ -184,11 +184,11 @@ builders: - shell: - !include-raw ./compass-build.sh + !include-raw: ./compass-build.sh - shell: - !include-raw ./compass-upload-artifact.sh + !include-raw: ./compass-upload-artifact.sh - shell: - !include-raw ./compass-workspace-cleanup.sh + !include-raw: ./compass-workspace-cleanup.sh - job-template: name: 'compass-build-ppa-{stream}' @@ -221,7 +221,7 @@ builders: - shell: - !include-raw ./compass-makeppa.sh + !include-raw: ./compass-makeppa.sh - job-template: name: 'compass-deploy-virtual-{sdn-controller}-{stream}' @@ -255,11 +255,11 @@ builders: - shell: - !include-raw ./compass-workspace-precleanup.sh + !include-raw: ./compass-workspace-precleanup.sh - shell: - !include-raw ./compass-download-artifact.sh + !include-raw: ./compass-download-artifact.sh - shell: - !include-raw ./compass-deploy-virtual.sh + !include-raw: ./compass-deploy-virtual.sh publishers: - archive: diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 6b28b565f..c9a44e22e 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -40,20 +40,22 @@ # new scenario descriptions scenario: - - 'os_ha': - auto-trigger-name: 'disabled-trigger' - - 'os_odl-l2_ha': - auto-trigger-name: '{scenario}-trigger' - - 'os_odl-l3_ha': - auto-trigger-name: 'disabled-trigger' - - 'os_onos_ha': - auto-trigger-name: 'disabled-trigger' - - 'os_kvm_ha': - auto-trigger-name: 'disabled-trigger' - - 'os_ovs_ha': - auto-trigger-name: 'disabled-trigger' - - 'os_kvm_ovs_ha': - auto-trigger-name: 'disabled-trigger' + - 'os-nosdn-kvm-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-kvm_ovs-ha': + auto-trigger-name: 'brahmaputra-trigger-daily-disabled' + - 'os-nosdn-nofeature-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: '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' jobs: - 'fuel-{scenario}-{pod}-daily-{stream}' @@ -77,7 +79,7 @@ - build-blocker: use-build-blocker: true blocking-jobs: - - 'fuel-os_.*?-{pod}-daily-{stream}' + - 'fuel-os-.*?-{pod}-daily-{stream}' wrappers: - build-name: @@ -190,97 +192,35 @@ ######################## # trigger macros ######################## -# os_odl-l2_ha trigger - trigger: - name: 'os_odl-l2_ha-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-trigger' + triggers: + - timed: '0 2 * * *' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-trigger' + triggers: + - timed: '0 2 * * *' +- trigger: + name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-trigger' triggers: - timed: '0 2 * * *' - -# the rest of the scenarios disabled at the moment - trigger: - name: 'disabled-trigger' + name: 'fuel-os-odl_l2-nofeature-ha-virtual-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-vlan-ha-opnfv-jump-2-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-vlan-ha-ericsson-pod1-trigger' + triggers: + - timed: '0 2 * * *' +- trigger: + name: 'fuel-os-nosdn-vlan-ha-ericsson-pod2-trigger' + triggers: + - timed: '' +- trigger: + name: 'fuel-os-nosdn-vlan-ha-virtual-trigger' triggers: - timed: '' - -# more granuler triggers based on the scenario and pod -# commented out for the timebeing -#- trigger: -# name: 'fuel-os_ha-opnfv-jump-2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_odl-l3_ha-opnfv-jump-2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_onos_ha-opnfv-jump-2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_kvm_ha-opnfv-jump-2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_ovs_ha-opnfv-jump-2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_kvm_ovs_ha-opnfv-jump-2-trigger' -# triggers: -# - timed: '' -# -## ericsson-pod1 triggers - only os_odl-l2_ha trigger is enabled -#- trigger: -# name: 'fuel-os_odl-l2_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '0 2 * * *' -#- trigger: -# name: 'fuel-os_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_odl-l3_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_onos_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_kvm_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_ovs_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_kvm_ovs_ha-ericsson-pod1-trigger' -# triggers: -# - timed: '' -# -## ericsson-pod2 triggers - only os_odl-l2_ha trigger is enabled -#- trigger: -# name: 'fuel-os_odl-l2_ha-ericsson-pod2-trigger' -# triggers: -# - timed: '0 2 * * *' -#- trigger: -# name: 'fuel-os_ha-ericsson-pod2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_odl-l3_ha-ericsson-pod2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_onos_ha-ericsson-pod2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_kvm_ha-ericsson-pod2-trigger' -# triggers: -# - timed: '' -#- trigger: -# name: 'fuel-os_ovs_ha-ericsson-pod2-trigger' -# triggers: -# - timed: '' diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index 655554127..a1a1de47e 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -24,13 +24,14 @@ OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/} echo "Using $OPNFV_ARTIFACT for deployment" # check if we already have the ISO to avoid redownload -ISO_STORE=$HOME/opnfv/iso_store/fuel -if [[ -f "$ISO_STORE/$OPNFV_ARTIFACT" ]]; then - echo "ISO already exists. Skipping the download" - ln -s $ISO_STORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso - ls -al $WORKSPACE/opnfv.iso - exit 0 -fi +# disabled for the timebeing - needs adjustments +#ISO_STORE=$HOME/opnfv/iso_store/fuel +#if [[ -f "$ISO_STORE/$OPNFV_ARTIFACT" ]]; then +# echo "ISO already exists. Skipping the download" +# ln -s $ISO_STORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso +# ls -al $WORKSPACE/opnfv.iso +# exit 0 +#fi # log info to console echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL" diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index 40f41b883..95bc3a6b4 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -214,19 +214,19 @@ - ssh-agent-credentials: users: '{ssh-credentials}' - triggers: - - gerrit: - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - dependency-jobs: 'fuel-merge-build-{stream}' +# triggers: +# - gerrit: +# trigger-on: +# - change-merged-event +# - comment-added-contains-event: +# comment-contains-value: 'remerge' +# projects: +# - project-compare-type: 'ANT' +# project-pattern: '{project}' +# branches: +# - branch-compare-type: 'ANT' +# branch-pattern: '**/{branch}' +# dependency-jobs: 'fuel-merge-build-{stream}' builders: - shell: diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 67031a0ab..2b1142629 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -237,7 +237,7 @@ name: functest-store-results builders: - shell: - !include-raw res-build.sh + !include-raw: res-build.sh - builder: name: functest-cleanup diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml index 368dab54e..34793adf6 100644 --- a/jjb/kvmfornfv/kvmfornfv.yml +++ b/jjb/kvmfornfv/kvmfornfv.yml @@ -57,7 +57,7 @@ builders: - shell: - !include-raw ./kvmfornfv-build.sh + !include-raw: ./kvmfornfv-build.sh - job-template: name: 'kvmfornfv-merge-{stream}' @@ -95,4 +95,4 @@ builders: - shell: - !include-raw ./kvmfornfv-build.sh + !include-raw: ./kvmfornfv-build.sh diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 6fd7a70cd..08f90c65c 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -19,7 +19,7 @@ description: 'Scenario to deploy and test' - string: name: EXTERNAL_NETWORK - default: 'net04_ext' + default: 'external' description: 'external network for test' - parameter: diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index da62681d9..108485d0b 100644 --- a/jjb/opnfv/opnfv-docker.sh +++ b/jjb/opnfv/opnfv-docker.sh @@ -91,7 +91,7 @@ echo "Tag version to be build and pushed: $DOCKER_TAG" # Start the build echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG..." -docker build -t --no-cache $DOCKER_REPO_NAME:$DOCKER_TAG . +docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG . echo "Creating tag 'latest'..." docker tag $DOCKER_REPO_NAME:$DOCKER_TAG $DOCKER_REPO_NAME:latest diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml index 1f761dec0..9c627b8af 100644 --- a/jjb/qtip/qtip.yml +++ b/jjb/qtip/qtip.yml @@ -136,7 +136,7 @@ name: qtip-run-suite builders: - shell: | - #!/bin/basih + #!/bin/bash echo "The container id is:" container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1) echo $container_id diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index 27007d0da..0b36f0775 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -49,7 +49,7 @@ builders: - shell: - !include-raw verify-releng + !include-raw: verify-releng publishers: - archive-artifacts: diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml index 21390792a..fffd18331 100644 --- a/jjb/yardstick/yardstick-ci-jobs.yml +++ b/jjb/yardstick/yardstick-ci-jobs.yml @@ -23,6 +23,9 @@ # brahmaputra #-------------------------------- pod: + - opnfv-jump-1: + installer: apex + <<: *brahmaputra - opnfv-jump-2: installer: fuel <<: *brahmaputra @@ -53,6 +56,9 @@ - orange-pod2: installer: joid <<: *master + - opnfv-jump-1: + installer: apex + <<: *master #-------------------------------- loop: - daily @@ -142,7 +148,7 @@ name: yardstick-fetch-os-creds builders: - shell: - !include-raw ../../utils/fetch_os_creds.sh + !include-raw: ../../utils/fetch_os_creds.sh - builder: name: yardstick-cleanup @@ -211,7 +217,13 @@ name: YARDSTICK_DB_BACKEND default: '' description: 'Arguments to use in order to choose the backend DB' - +- parameter: + name: 'yardstick-params-opnfv-jump-1' + parameters: + - string: + 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: |