diff options
Diffstat (limited to 'jjb/apex')
| -rwxr-xr-x | jjb/apex/apex-unit-test.sh | 2 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 42 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 12 |
4 files changed, 25 insertions, 33 deletions
diff --git a/jjb/apex/apex-unit-test.sh b/jjb/apex/apex-unit-test.sh index 3112c9d36..3f15847f2 100755 --- a/jjb/apex/apex-unit-test.sh +++ b/jjb/apex/apex-unit-test.sh @@ -7,6 +7,8 @@ echo "Starting unit tests for Apex..." echo "---------------------------------------------------------------------------------------" echo +PATH=$PATH:/usr/sbin + pushd build/ > /dev/null for pkg in yamllint rpmlint iproute epel-release python34-devel python34-nose python34-PyYAML python-pep8 python34-mock python34-pip; do diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml index 6b7271f7e..7dbd6709b 100644 --- a/jjb/apex/apex-verify-jobs.yml +++ b/jjb/apex/apex-verify-jobs.yml @@ -317,7 +317,7 @@ builders: # yamllint disable rule:line-length - shell: | - echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os|k8s-.*$') > detected_scenario + echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo '(os|k8s)-.*$') > detected_scenario # yamllint enable rule:line-length - inject: properties-file: detected_scenario diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 849720336..587a06377 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -82,16 +82,10 @@ <<: *fraser - 'os-nosdn-bar-noha': <<: *fraser - - 'os-nosdn-nofeature-ha-ipv6': - <<: *fraser - 'os-nosdn-ovs_dpdk-noha': <<: *fraser - 'os-nosdn-ovs_dpdk-ha': <<: *fraser - - 'os-nosdn-kvm_ovs_dpdk-noha': - <<: *fraser - - 'os-nosdn-kvm_ovs_dpdk-ha': - <<: *fraser - 'os-odl-sfc-noha': <<: *fraser - 'os-odl-sfc-ha': @@ -496,6 +490,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -505,7 +500,16 @@ GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-fetch-logs-{scenario_stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER abort-all-job: true git-revision: false - multijob: @@ -1224,14 +1228,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser' node-parameters: false current-parameters: false @@ -1248,22 +1244,6 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - name: 'apex-os-nosdn-kvm_ovs_dpdk-noha-baremetal-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - - name: 'apex-os-nosdn-kvm_ovs_dpdk-ha-baremetal-fraser' - node-parameters: false - current-parameters: false - predefined-parameters: | - OPNFV_CLEAN=yes - kill-phase-on: NEVER - abort-all-job: true - git-revision: false - name: 'apex-os-odl-sfc-noha-baremetal-fraser' node-parameters: false current-parameters: false diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index dac7c3a88..4620bbc7e 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -374,6 +374,7 @@ - multijob: name: 'Baremetal Deploy' condition: SUCCESSFUL + execution-type: SEQUENTIALLY projects: - name: 'apex-deploy-baremetal-{scenario_stream}' node-parameters: true @@ -383,7 +384,16 @@ GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC= DEPLOY_SCENARIO=$DEPLOY_SCENARIO - kill-phase-on: FAILURE + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + - name: 'apex-fetch-logs-{scenario_stream}' + current-parameters: true + predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= + node-parameters: true + kill-phase-on: NEVER abort-all-job: true git-revision: false - multijob: |