summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjjb/apex/apex-unit-test.sh2
-rw-r--r--jjb/apex/apex.yml42
-rw-r--r--jjb/apex/apex.yml.j212
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml6
-rw-r--r--jjb/joid/joid-daily-jobs.yml2
-rw-r--r--jjb/releng/opnfv-utils.yml1
6 files changed, 29 insertions, 36 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.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:
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 444b17361..c357ff641 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -14,14 +14,14 @@
gs-pathname: ''
ppa-pathname: '/{stream}'
disabled: false
- openstack-version: 'ocata'
+ openstack-version: 'pike'
branch-type: 'master'
- - euphrates:
+ - fraser:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
ppa-pathname: '/{stream}'
disabled: false
- openstack-version: 'ocata'
+ openstack-version: 'pike'
branch-type: 'master'
distro:
diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 1e92fbfef..2719c7292 100644
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -316,7 +316,7 @@
- trigger:
name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
triggers:
- - timed: '5 23 * * *'
+ - timed: '' # Disabled as there is no branch for orchestra
# os-nosdn-openbaton-ha trigger - branch: master
- trigger:
name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index fb3bab42b..19fb4b5af 100644
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -129,6 +129,7 @@
default-slaves:
- lf-build1
- lf-build2
+ - ericsson-build4
allowed-multiselect: true
ignore-offline-nodes: true
- project-parameter: