summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex')
-rwxr-xr-xjjb/apex/apex-iso-verify.sh81
-rw-r--r--jjb/apex/apex.yml91
-rw-r--r--jjb/apex/apex.yml.j227
3 files changed, 76 insertions, 123 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.*'