summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/apex/apex-iso-verify.sh81
-rw-r--r--jjb/apex/apex.yml91
-rw-r--r--jjb/apex/apex.yml.j227
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml32
-rwxr-xr-xjjb/dovetail/dovetail-artifacts-upload.sh2
-rw-r--r--jjb/dovetail/dovetail-artifacts-upload.yml36
-rwxr-xr-xjjb/dovetail/dovetail-cleanup.sh8
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml122
-rw-r--r--jjb/functest/functest-project-jobs.yml2
-rwxr-xr-xjjb/functest/set-functest-env.sh11
-rw-r--r--jjb/releng/opnfv-lint.yml2
-rwxr-xr-xjjb/securedlab/check-jinja2.sh2
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml13
13 files changed, 157 insertions, 272 deletions
diff --git a/jjb/apex/apex-iso-verify.sh b/jjb/apex/apex-iso-verify.sh
index cdeac04d7..f102421f3 100755
--- a/jjb/apex/apex-iso-verify.sh
+++ b/jjb/apex/apex-iso-verify.sh
@@ -8,8 +8,6 @@ echo "Starting the Apex iso verify."
echo "--------------------------------------------------------"
echo
-BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
-
source $BUILD_DIRECTORY/../opnfv.properties
if ! rpm -q virt-install > /dev/null; then
@@ -29,76 +27,37 @@ fi
# Make sure a pre-existing iso-verify isn't there
rm_apex_iso_verify
+#make sure there is not an existing console log file for the VM
+sudo rm -f /var/log/libvirt/qemu/apex-iso-verify-console.log
+
# run an install from the iso
# This streams a serial console to tcp port 3737 on localhost
sudo virt-install -n apex-iso-verify -r 4096 --vcpus 4 --os-variant=rhel7 \
- --accelerate -v --noautoconsole --nographics \
+ --accelerate -v --noautoconsole \
--disk path=/var/lib/libvirt/images/apex-iso-verify.qcow2,size=30,format=qcow2 \
-l $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso \
--extra-args 'console=ttyS0 console=ttyS0,115200n8 serial inst.ks=file:/iso-verify.ks inst.stage2=hd:LABEL=OPNFV\x20CentOS\x207\x20x86_64:/' \
--initrd-inject $BUILD_DIRECTORY/../ci/iso-verify.ks \
- --serial tcp,host=:3737,protocol=raw
-
-# Attach to tcpport 3737 and echo the output to stdout
-# watch for a 5 min time out, a power off message or a tcp disconnect
-python << EOP
-#!/usr/bin/env python
-
-import sys
-import socket
-from time import sleep
-from time import time
-
-
-TCP_IP = '127.0.0.1'
-TCP_PORT = 3737
-BUFFER_SIZE = 1024
-
-try:
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect((TCP_IP, TCP_PORT))
-except Exception, e:
- print "Failed to connect to the iso-verofy vm's serial console"
- print "this probably means that the VM failed to start"
- raise e
-
-activity = time()
-data = s.recv(BUFFER_SIZE)
-last_data = data
-while time() - activity < 300:
- try:
- if data != last_data:
- activity = time()
- last_data = data
- data = s.recv(BUFFER_SIZE)
- sys.stdout.write(data)
- if 'Powering off' in data:
- break
- sleep(.5)
- except socket.error, e:
- # for now assuming that the connection was closed
- # which is good, means the vm finished installing
- # printing the error output just in case we need to debug
- print "VM console connection lost: %s" % msg
- break
-s.close()
-
-if time() - activity > 300:
- print "failing due to console inactivity"
- exit(1)
-else:
- print "Success!"
-EOP
-
-# save the python return code for after cleanup
-python_rc=$?
+ --serial file,path=/var/log/libvirt/qemu/apex-iso-verify-console.log
+
+echo "Waiting for install to finish..."
+sleep 10
+end_time=$(($SECONDS+1500))
+while ! [[ `sudo tail -n1 /var/log/libvirt/qemu/apex-iso-verify-console.log` =~ 'Power down' ]]; do
+ if [ $SECONDS -gt $end_time ] || ! sudo virsh list --all | grep apex-iso-verify | grep running > /dev/null; then
+ sudo cat /var/log/libvirt/qemu/apex-iso-verify-console.log
+ sudo virsh list --all
+ echo "Error: Failed to find power down message after install"
+ exit 1
+ fi
+ sleep 10
+done
+
+sudo cat /var/log/libvirt/qemu/apex-iso-verify-console.log
# clean up
rm_apex_iso_verify
-# Exit with the RC of the Python job
-exit $python_rc
-
echo
echo "--------------------------------------------------------"
echo "Done!"
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index a9646073e..861b713a0 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -13,7 +13,7 @@
- 'apex-csit-promote-daily-{stream}'
- 'apex-fdio-promote-daily-{stream}'
- 'apex-verify-iso-{stream}'
- - 'apex-deploy-test-baremetal-{stream}'
+ - 'apex-run-deploy-test-baremetal-{stream}'
- 'apex-upload-snapshot'
- 'apex-create-snapshot'
# stream: branch with - in place of / (eg. stable-arno)
@@ -152,9 +152,8 @@
- 'apex-daily.*'
- 'apex-deploy.*'
- 'apex-runner.*'
- - 'apex-verify.*'
- throttle:
- max-per-node: 1
+ max-per-node: 3
max-total: 10
option: 'project'
@@ -286,11 +285,9 @@
blocking-jobs:
- 'apex-daily.*'
- 'apex-deploy.*'
- - 'apex-build.*'
- 'apex-runner.*'
- - 'apex-verify.*'
- throttle:
- max-per-node: 1
+ max-per-node: 3
max-total: 10
option: 'project'
@@ -429,7 +426,7 @@
properties:
- logrotate-default
- throttle:
- max-per-node: 1
+ max-per-node: 3
max-total: 10
option: 'project'
@@ -531,6 +528,8 @@
block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
+ - 'functest.*'
+ - 'yardstick.*'
- throttle:
max-per-node: 1
max-total: 10
@@ -546,7 +545,7 @@
# Baremetal Deploy and Test
- job-template:
- name: 'apex-deploy-test-baremetal-{stream}'
+ name: 'apex-run-deploy-test-baremetal-{stream}'
# Job template for daily build
#
@@ -579,9 +578,9 @@
block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- - 'apex-deploy.*'
- 'apex-runner.*'
- 'apex-.*-promote.*'
+ - 'apex-run.*'
builders:
- description-setter:
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@ -665,7 +664,7 @@
current-parameters: false
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_REFSPEC=
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
@@ -679,9 +678,9 @@
- name: 'apex-verify-iso-danube'
current-parameters: false
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-danube/.build
+ BUILD_DIRECTORY=$WORKSPACE/../apex-build-danube/.build
GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_REFSPEC=
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
@@ -693,7 +692,7 @@
condition: SUCCESSFUL
projects:
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -703,7 +702,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -713,7 +712,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -723,7 +722,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -733,7 +732,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -743,7 +742,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -753,7 +752,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -763,7 +762,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -773,7 +772,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -783,7 +782,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -793,7 +792,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -803,7 +802,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -813,7 +812,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -823,7 +822,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -833,7 +832,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -843,7 +842,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -853,7 +852,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -863,7 +862,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -873,7 +872,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -883,7 +882,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -893,7 +892,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -903,7 +902,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -913,7 +912,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -923,7 +922,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -933,7 +932,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -943,7 +942,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-danube'
+ - name: 'apex-run-deploy-test-baremetal-danube'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -996,7 +995,7 @@
current-parameters: false
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_REFSPEC=
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
@@ -1010,9 +1009,9 @@
- name: 'apex-verify-iso-master'
current-parameters: false
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-master/.build
+ BUILD_DIRECTORY=$WORKSPACE/../apex-build-master/.build
GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_REFSPEC=
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
@@ -1024,7 +1023,7 @@
condition: SUCCESSFUL
projects:
- - name: 'apex-deploy-test-baremetal-master'
+ - name: 'apex-run-deploy-test-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1034,7 +1033,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-master'
+ - name: 'apex-run-deploy-test-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1044,7 +1043,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-master'
+ - name: 'apex-run-deploy-test-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1054,7 +1053,7 @@
abort-all-job: true
git-revision: false
- - name: 'apex-deploy-test-baremetal-master'
+ - name: 'apex-run-deploy-test-baremetal-master'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -1127,7 +1126,6 @@
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
- - 'apex-build.*'
- 'apex-runner.*'
- 'apex-daily.*'
@@ -1235,7 +1233,6 @@
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
- - 'apex-build.*'
- 'apex-runner.*'
- 'apex-daily.*'
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index dd8af6a28..1df6e154c 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -13,7 +13,7 @@
- 'apex-csit-promote-daily-{stream}'
- 'apex-fdio-promote-daily-{stream}'
- 'apex-verify-iso-{stream}'
- - 'apex-deploy-test-baremetal-{stream}'
+ - 'apex-run-deploy-test-baremetal-{stream}'
- 'apex-upload-snapshot'
- 'apex-create-snapshot'
# stream: branch with - in place of / (eg. stable-arno)
@@ -152,9 +152,8 @@
- 'apex-daily.*'
- 'apex-deploy.*'
- 'apex-runner.*'
- - 'apex-verify.*'
- throttle:
- max-per-node: 1
+ max-per-node: 3
max-total: 10
option: 'project'
@@ -286,11 +285,9 @@
blocking-jobs:
- 'apex-daily.*'
- 'apex-deploy.*'
- - 'apex-build.*'
- 'apex-runner.*'
- - 'apex-verify.*'
- throttle:
- max-per-node: 1
+ max-per-node: 3
max-total: 10
option: 'project'
@@ -429,7 +426,7 @@
properties:
- logrotate-default
- throttle:
- max-per-node: 1
+ max-per-node: 3
max-total: 10
option: 'project'
@@ -531,6 +528,8 @@
block-level: 'NODE'
blocking-jobs:
- 'apex-deploy.*'
+ - 'functest.*'
+ - 'yardstick.*'
- throttle:
max-per-node: 1
max-total: 10
@@ -546,7 +545,7 @@
# Baremetal Deploy and Test
- job-template:
- name: 'apex-deploy-test-baremetal-{stream}'
+ name: 'apex-run-deploy-test-baremetal-{stream}'
# Job template for daily build
#
@@ -579,9 +578,9 @@
block-level: 'NODE'
blocking-jobs:
- 'apex-verify.*'
- - 'apex-deploy.*'
- 'apex-runner.*'
- 'apex-.*-promote.*'
+ - 'apex-run.*'
builders:
- description-setter:
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
@@ -665,7 +664,7 @@
current-parameters: false
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_REFSPEC=
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
@@ -679,9 +678,9 @@
- name: 'apex-verify-iso-{{ stream }}'
current-parameters: false
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-{{ stream }}/.build
+ BUILD_DIRECTORY=$WORKSPACE/../apex-build-{{ stream }}/.build
GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_REFSPEC=
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
node-parameters: true
@@ -693,7 +692,7 @@
condition: SUCCESSFUL
projects:
{% for scenario in scenarios[stream] %}
- - name: 'apex-deploy-test-baremetal-{{ stream }}'
+ - name: 'apex-run-deploy-test-baremetal-{{ stream }}'
node-parameters: false
current-parameters: false
predefined-parameters: |
@@ -766,7 +765,6 @@
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
- - 'apex-build.*'
- 'apex-runner.*'
- 'apex-daily.*'
@@ -874,7 +872,6 @@
blocking-jobs:
- 'apex-verify.*'
- 'apex-deploy.*'
- - 'apex-build.*'
- 'apex-runner.*'
- 'apex-daily.*'
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 61845acdf..e1e760dab 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -157,19 +157,25 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- #dovetail only master by now, not sync with A/B/C branches
- #here the stream means the SUT stream, dovetail stream is defined in its own job
- - trigger-builds:
- - project: 'dovetail-compass-{pod}-proposed_tests-{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'
+ # dovetail only master by now, not sync with A/B/C branches
+ # here the stream means the SUT stream, dovetail stream is defined in its own job
+ # only run on os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha scenario
+ - conditional-step:
+ condition-kind: regex-match
+ regex: os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha
+ label: '{scenario}'
+ steps:
+ - trigger-builds:
+ - project: 'dovetail-compass-{pod}-proposed_tests-{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}'
diff --git a/jjb/dovetail/dovetail-artifacts-upload.sh b/jjb/dovetail/dovetail-artifacts-upload.sh
index b23decad1..f1a9e7222 100755
--- a/jjb/dovetail/dovetail-artifacts-upload.sh
+++ b/jjb/dovetail/dovetail-artifacts-upload.sh
@@ -52,7 +52,7 @@ echo "signature Upload Complete!"
upload () {
# log info to console
-echo "Uploading to artifact. This could take some time..."
+echo "Uploading ${STORE_FILE_NAME} to artifact. This could take some time..."
echo
cd $WORKSPACE
diff --git a/jjb/dovetail/dovetail-artifacts-upload.yml b/jjb/dovetail/dovetail-artifacts-upload.yml
index 3d9af5ed7..0c8efbe0d 100644
--- a/jjb/dovetail/dovetail-artifacts-upload.yml
+++ b/jjb/dovetail/dovetail-artifacts-upload.yml
@@ -19,6 +19,8 @@
- 'dovetail'
- 'functest'
- 'yardstick'
+ - 'testapi'
+ - 'mongo'
#############################################
# job template
@@ -55,7 +57,8 @@
builders:
- 'dovetail-builder-artifacts-upload'
- - 'dovetail-workspace-cleanup'
+ - 'dovetail-upload-artifacts-cache-cleanup'
+ - 'dovetail-images-cleanup'
####################
# parameter macros
@@ -94,7 +97,7 @@
!include-raw: ./dovetail-artifacts-upload.sh
- builder:
- name: dovetail-workspace-cleanup
+ name: dovetail-upload-artifacts-cache-cleanup
builders:
- shell: |
#!/bin/bash
@@ -104,27 +107,8 @@
/bin/rm -rf $CACHE_DIR
- # Remove previous running containers if exist
- if [[ -n "$(docker ps -a | grep $DOCKER_REPO_NAME)" ]]; then
- echo "Removing existing $DOCKER_REPO_NAME containers..."
- docker ps -a | grep $DOCKER_REPO_NAME | awk '{print $1}' | xargs docker rm -f
- t=60
- # Wait max 60 sec for containers to be removed
- while [[ $t -gt 0 ]] && [[ -n "$(docker ps| grep $DOCKER_REPO_NAME)" ]]; do
- sleep 1
- let t=t-1
- done
- fi
-
- # Remove existing images if exist
- if [[ -n "$(docker images | grep $DOCKER_REPO_NAME)" ]]; then
- echo "Docker images to remove:"
- docker images | head -1 && docker images | grep $DOCKER_REPO_NAME
- image_tags=($(docker images | grep $DOCKER_REPO_NAME | awk '{print $2}'))
- for tag in "${image_tags[@]}"; do
- if [[ -n "$(docker images|grep $DOCKER_REPO_NAME|grep $tag)" ]]; then
- echo "Removing docker image $DOCKER_REPO_NAME:$tag..."
- docker rmi -f $DOCKER_REPO_NAME:$tag
- fi
- done
- fi
+- builder:
+ name: dovetail-images-cleanup
+ builders:
+ - shell:
+ !include-raw: ./dovetail-cleanup.sh
diff --git a/jjb/dovetail/dovetail-cleanup.sh b/jjb/dovetail/dovetail-cleanup.sh
index 22b2ba2ce..0ee789a97 100755
--- a/jjb/dovetail/dovetail-cleanup.sh
+++ b/jjb/dovetail/dovetail-cleanup.sh
@@ -2,8 +2,8 @@
[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
-#clean up dependent project docker images, which has no containers and image tag None
-clean_images=(opnfv/functest opnfv/yardstick)
+# clean up dependent project docker images, which has no containers and image tag None
+clean_images=(opnfv/functest opnfv/yardstick opnfv/testapi mongo)
for clean_image in "${clean_images[@]}"; do
echo "Removing image $image_id, which has no containers and image tag is None"
dangling_images=($(docker images -f "dangling=true" | grep ${clean_image} | awk '{print $3}'))
@@ -14,7 +14,7 @@ for clean_image in "${clean_images[@]}"; do
fi
done
-echo "Remove containers with image dovetail:<None>..."
+echo "Remove containers with image opnfv/dovetail:<None>..."
dangling_images=($(docker images -f "dangling=true" | grep opnfv/dovetail | awk '{print $3}'))
if [[ -n ${dangling_images} ]]; then
for image_id in "${dangling_images[@]}"; do
@@ -24,7 +24,7 @@ if [[ -n ${dangling_images} ]]; then
done
fi
-echo "Cleaning up dovetail docker containers/images..."
+echo "Cleaning up dovetail docker containers..."
if [[ ! -z $(docker ps -a | grep opnfv/dovetail) ]]; then
echo "Removing existing opnfv/dovetail containers..."
docker ps -a | grep opnfv/dovetail | awk '{print $1}' | xargs docker rm -f >${redirect}
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index 2fa868779..5432c9447 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -73,8 +73,8 @@
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-odl_l2-sfc-ha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- # - 'os-odl_l2-bgpvpn-ha':
- # auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+ - 'os-odl_l2-bgpvpn-ha':
+ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-kvm-ha':
auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
- 'os-nosdn-ovs-ha':
@@ -112,7 +112,6 @@
jobs:
- 'fuel-{scenario}-{pod}-daily-{stream}'
- 'fuel-deploy-{pod}-daily-{stream}'
- - 'fuel-os-odl_l2-bgpvpn-ha-{pod}-daily-{stream}'
########################
# job templates
@@ -190,107 +189,32 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
-
- publishers:
- - email:
- recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
-
-- job-template:
- name: 'fuel-os-odl_l2-bgpvpn-ha-{pod}-daily-{stream}'
-
- disabled: '{obj:disabled}'
-
- concurrent: false
-
- properties:
- - logrotate-default
- - throttle:
- enabled: true
- max-total: 4
- max-per-node: 1
- option: 'project'
- - build-blocker:
- use-build-blocker: true
- blocking-jobs:
- - 'fuel-os-.*?-{pod}-daily-.*'
- - 'fuel-os-.*?-{pod}-weekly-.*'
- block-level: 'NODE'
-
- wrappers:
- - build-name:
- name: '$BUILD_NUMBER - Scenario: os-odl_l2-bgpvpn-ha'
-
- triggers:
- - 'fuel-os-odl_l2-bgpvpn-ha-{pod}-daily-{stream}-trigger'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - '{installer}-defaults'
- - '{slave-label}-defaults':
- installer: '{installer}'
- - string:
- name: DEPLOY_SCENARIO
- default: "os-odl_l2-bgpvpn-ha"
- - fuel-ci-parameter:
- gs-pathname: '{gs-pathname}'
-
- builders:
- - description-setter:
- description: "Built on $NODE_NAME"
- - trigger-builds:
- - project: 'fuel-deploy-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
- same-node: true
- block: true
- - trigger-builds:
- - project: 'functest-fuel-{pod}-daily-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
- 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=os-odl_l2-bgpvpn-ha
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
- # 1.dovetail only master by now, not sync with A/B/C branches
+ # 1.dovetail only has master, based on D release
# 2.here the stream means the SUT stream, dovetail stream is defined in its own job
- # 3.only debug testsuite here(includes basic testcase,
- # i.e. refstack ipv6 vpn test cases from functest, HA test case
- # from yardstick)
+ # 3.only debug testsuite here(refstack, ha, ipv6, bgpvpn)
# 4.not used for release criteria or compliance,
- # only to debug the dovetail tool bugs with fuel bgpvpn scenario
- - trigger-builds:
- - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO=os-odl_l2-bgpvpn-ha
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
+ # only to debug the dovetail tool bugs with bgpvpn
+ # 5,only run against scenario os-odl_l2-bgpvpn-ha(regex used here, can extend to more scenarios future)
+ - conditional-step:
+ condition-kind: regex-match
+ regex: os-odl_l2-bgpvpn-ha
+ label: '{scenario}'
+ steps:
+ - trigger-builds:
+ - project: 'dovetail-fuel-{pod}-proposed_tests-{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'
publishers:
- email:
- recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com matthew.lijun@huawei.com
-
+ recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
- job-template:
name: 'fuel-deploy-{pod}-daily-{stream}'
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 14ad73a91..7036f20c0 100644
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -88,4 +88,4 @@
name: functest-unit-tests-and-docs-build
builders:
- shell: |
- $WORKSPACE/run_unit_tests.sh
+ cd $WORKSPACE && tox
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index 1acf0a2ad..89dabb056 100755
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -48,7 +48,6 @@ if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
fi
-
# Set iptables rule to allow forwarding return traffic for container
if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
sudo iptables -I FORWARD -j RETURN
@@ -59,6 +58,12 @@ DEPLOY_TYPE=baremetal
echo "Functest: Start Docker and prepare environment"
+echo "Functest: Download images that will be used by test cases"
+images_dir="${HOME}/opnfv/functest/images"
+chmod +x ${WORKSPACE}/functest/ci/download_images.sh
+${WORKSPACE}/functest/ci/download_images.sh ${images_dir}
+images_vol="-v ${images_dir}:/home/opnfv/functest/images"
+
dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}"
mkdir -p ${dir_result}
sudo rm -rf ${dir_result}/*
@@ -80,7 +85,7 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} == *'os-nosdn-openo-h
envs=${env}" -e OPENO_MSB_ENDPOINT=${openo_msb_endpoint}"
fi
-volumes="${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}"
+volumes="${images_vol} ${results_vol} ${sshkey_vol} ${stackrc_vol} ${rc_file_vol}"
HOST_ARCH=$(uname -m)
FUNCTEST_IMAGE="opnfv/functest"
@@ -88,7 +93,7 @@ if [ "$HOST_ARCH" = "aarch64" ]; then
FUNCTEST_IMAGE="${FUNCTEST_IMAGE}_${HOST_ARCH}"
fi
-echo "Functest: Pulling image ${FUNCTEST_IMAGE}:${DOCKER_TAG}"
+echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE}:${DOCKER_TAG}"
docker pull ${FUNCTEST_IMAGE}:$DOCKER_TAG >/dev/null
cmd="sudo docker run --privileged=true -id ${envs} ${volumes} \
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 166aea8f9..8c231c3e8 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -53,7 +53,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'functest|sdnvpn|qtip|daisy|sfc|escalator|releng'
+ project-pattern: 'functest|sdnvpn|qtip|daisy|sfc|escalator|releng|pharos|octopus|securedlab'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
diff --git a/jjb/securedlab/check-jinja2.sh b/jjb/securedlab/check-jinja2.sh
index 57650ec28..4c1927d77 100755
--- a/jjb/securedlab/check-jinja2.sh
+++ b/jjb/securedlab/check-jinja2.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set +x
set -o errexit
-for lab_configs in $(find labs/ -name 'pod.yaml'); do
+for lab_configs in $(find labs/ -name 'pod*.yaml'); do
while IFS= read -r jinja_templates; do
echo "./utils/generate_config.py -y $lab_configs -j $jinja_templates"
./utils/generate_config.py -y $lab_configs -j $jinja_templates
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index bbfa152a2..643c1f932 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -58,6 +58,13 @@
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+
+ wrappers:
+ - ssh-agent-wrapper
+ - timeout:
+ timeout: 30
+ fail: true
+
builders:
- yardstick-unit-tests-and-docs-build
@@ -93,6 +100,12 @@
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
+ wrappers:
+ - ssh-agent-wrapper
+ - timeout:
+ timeout: 30
+ fail: true
+
builders:
- yardstick-unit-tests-and-docs-build