summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/apex-verify-jobs.yml8
-rw-r--r--jjb/apex/apex.yml6
-rw-r--r--jjb/apex/apex.yml.j26
-rw-r--r--jjb/compass4nfv/compass-logs.sh2
-rw-r--r--[-rwxr-xr-x]jjb/functest/functest-daily-jobs.yml0
-rwxr-xr-xjjb/functest/functest-env-presetup.sh2
-rw-r--r--jjb/global/releng-macros.yml4
-rw-r--r--jjb/global/slave-params.yml47
-rwxr-xr-xjjb/xci/bifrost-verify.sh5
-rw-r--r--jjb/xci/xci-verify-jobs.yml8
10 files changed, 17 insertions, 71 deletions
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 88c1b1765..421a3fa31 100644
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -108,8 +108,6 @@
- job-template:
name: 'apex-verify-{stream}'
- node: 'apex-virtual-master'
-
concurrent: true
disabled: '{obj:disabled}'
@@ -117,6 +115,7 @@
project-type: 'multijob'
parameters:
+ - '{project}-virtual-{stream}-defaults'
- apex-parameter:
gs-pathname: '{gs-pathname}/dev'
- project-parameter:
@@ -239,7 +238,7 @@
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
+ node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
@@ -248,8 +247,6 @@
- job-template:
name: 'apex-verify-gate-{stream}'
- node: 'apex-build-{stream}'
-
concurrent: true
disabled: '{obj:disabled}'
@@ -257,6 +254,7 @@
project-type: 'multijob'
parameters:
+ - '{project}-virtual-{stream}-defaults'
- apex-parameter:
gs-pathname: '{gs-pathname}/dev'
- project-parameter:
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6714d6a66..b07ccd660 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -255,8 +255,6 @@
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- node: 'apex-{platform}-{stream}'
-
concurrent: true
disabled: false
@@ -315,8 +313,6 @@
- job-template:
name: 'apex-virtual-{stream}'
- node: 'apex-virtual-master'
-
project-type: 'multijob'
disabled: false
@@ -581,8 +577,6 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{baremetal-slave}'
-
disabled: '{obj:disable_daily}'
scm:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 27a854dd7..b9cbd0240 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -129,8 +129,6 @@
- job-template:
name: 'apex-deploy-{platform}-{stream}'
- node: 'apex-{platform}-{stream}'
-
concurrent: true
disabled: false
@@ -189,8 +187,6 @@
- job-template:
name: 'apex-virtual-{stream}'
- node: 'apex-virtual-master'
-
project-type: 'multijob'
disabled: false
@@ -455,8 +451,6 @@
# branch: branch (eg. stable)
project-type: 'multijob'
- node: '{baremetal-slave}'
-
disabled: '{obj:disable_daily}'
scm:
diff --git a/jjb/compass4nfv/compass-logs.sh b/jjb/compass4nfv/compass-logs.sh
index 03c8b20ac..c028194e7 100644
--- a/jjb/compass4nfv/compass-logs.sh
+++ b/jjb/compass4nfv/compass-logs.sh
@@ -14,7 +14,7 @@ OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
COMPASS_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}_${OPNFV_ARTIFACT_VERSION}.log.tar.gz"
-sudo docker exec -it compass-tasks /bin/bash /opt/collect-log.sh
+sudo docker exec compass-tasks /bin/bash /opt/collect-log.sh
sudo docker cp compass-tasks:/opt/log.tar.gz ${LOG_DIRECTORY}/${COMPASS_LOG_FILENAME}
sudo chown $(whoami):$(whoami) ${LOG_DIRECTORY}/${COMPASS_LOG_FILENAME}
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 099d01a59..099d01a59 100755..100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
diff --git a/jjb/functest/functest-env-presetup.sh b/jjb/functest/functest-env-presetup.sh
index cd15d7194..b7d33e760 100755
--- a/jjb/functest/functest-env-presetup.sh
+++ b/jjb/functest/functest-env-presetup.sh
@@ -38,7 +38,7 @@ elif [[ ${INSTALLER_TYPE} == 'daisy' ]]; then
installer_mac=$(sudo virsh domiflist daisy | grep vnet | \
grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
- export INSTALLER_IP=$(/usr/sbin/arp -e -i $bridge_name | grep ${installer_mac} | awk {'print $1'})
+ export INSTALLER_IP=$(/usr/sbin/arp -e -i $bridge_name | grep ${installer_mac} | head -n 1 | awk {'print $1'})
echo "Installer ip is ${INSTALLER_IP}"
else
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index bd9f97d3b..a7d947f81 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -320,7 +320,7 @@
if [[ -s violation.log ]]; then
echo "Reporting lint result..."
msg="Found syntax error and/or coding style violation(s) in the files modified by your patchset."
- sed -i -e '1s/^//$msg\n\n/' violation.log
+ sed -i -e "1s#^#${msg}\n\n#" violation.log
cmd="gerrit review -p $GERRIT_PROJECT -m \"$(cat violation.log)\" $GERRIT_PATCHSET_REVISION --notify NONE"
ssh -p 29418 gerrit.opnfv.org "$cmd"
@@ -348,7 +348,7 @@
builders:
- shell: |
#!/bin/bash
- # Install python package
+ # Install python package
sudo pip install "flake8==2.6.2"
echo "Checking python code..."
diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 4902dcfc5..86b369bcd 100644
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -18,13 +18,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod1
- default-slaves:
- - lf-pod1
- parameter:
name: 'apex-baremetal-euphrates-defaults'
@@ -40,13 +33,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod1
- default-slaves:
- - lf-pod1
- parameter:
name: 'apex-baremetal-danube-defaults'
@@ -62,13 +48,7 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod1
- default-slaves:
- - lf-pod1
+
- parameter:
name: 'apex-virtual-master-defaults'
@@ -84,15 +64,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-virtual2
- - lf-virtual3
- default-slaves:
- - lf-virtual2
- - lf-virtual3
- parameter:
name: 'apex-virtual-euphrates-defaults'
@@ -108,15 +79,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-virtual2
- - lf-virtual3
- default-slaves:
- - lf-virtual2
- - lf-virtual3
- parameter:
name: 'apex-virtual-danube-defaults'
@@ -132,13 +94,6 @@
name: SSH_KEY
default: /root/.ssh/id_rsa
description: 'SSH key to use for Apex'
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - lf-pod3
- default-slaves:
- - lf-pod3
- parameter:
name: 'lf-pod1-defaults'
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 198f2e1c7..451f33b4b 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -21,6 +21,11 @@ git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
cd $WORKSPACE/releng-xci
cat > bifrost_test.sh<<EOF
+#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
+
cd ~/bifrost
# provision 3 VMs; xcimaster, controller, and compute
./scripts/bifrost-provision.sh
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 28bc317bd..3c314568f 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -21,10 +21,10 @@
notbuilt: false
- centos:
disabled: false
- successful: false
- failed: false
- unstable: false
- notbuilt: false
+ successful: true
+ failed: true
+ unstable: true
+ notbuilt: true
- opensuse:
disabled: false
successful: false