summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml64
-rw-r--r--jjb/opnfv/opnfv-docker.sh17
-rw-r--r--jjb/qtip/qtip.yml28
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml14
4 files changed, 81 insertions, 42 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index afa46977c..a1b922c5d 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -2,7 +2,7 @@
name: apex
jobs:
- 'apex-verify-{stream}'
- - 'apex-merge-{stream}'
+ - 'apex-runner-{platform}-{scenario}-{stream}'
- 'apex-build-{stream}'
- 'apex-deploy-virtual-{scenario}-{stream}'
- 'apex-deploy-baremetal-{scenario}-{stream}'
@@ -28,6 +28,10 @@
- 'os-onos-nofeature-ha'
- 'os-opencontrail-nofeature-ha'
+ platform:
+ - 'baremetal'
+ - 'virtual'
+
- job-template:
name: 'apex-verify-{stream}'
@@ -89,6 +93,7 @@
- "apex-daily.*"
- "apex-deploy.*"
- "apex-build.*"
+ - "apex-runner.*"
builders:
- 'apex-build'
@@ -107,15 +112,13 @@
- 'apex-workspace-cleanup'
- job-template:
- name: 'apex-merge-{stream}'
+ name: 'apex-runner-{platform}-{scenario}-{stream}'
- # builder-merge job to run JJB update
- #
- # This job's purpose is to update all the JJB
+ # runner jobs for deploying manually
node: opnfv-jump-1
- disabled: true
+ disabled: false
parameters:
- apex-parameter:
@@ -135,26 +138,34 @@
refspec: ''
choosing-strategy: 'default'
- triggers:
- - gerrit:
- trigger-on:
- - change-merged-event
- - comment-added-contains-event:
- comment-contains-value: 'remerge'
- projects:
- - project-compare-type: 'ANT'
- project-pattern: 'apex'
- branches:
- - branch-compare-type: 'ANT'
- branch-pattern: '**/master'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**'
+ properties:
+ - build-blocker:
+ use-build-blocker: true
+ blocking-jobs:
+ - "apex-daily.*"
+ - "apex-verify.*"
builders:
- - 'apex-build'
- - 'apex-deploy-virtual'
- - 'apex-workspace-cleanup'
+ - trigger-builds:
+ - project: 'apex-deploy-{platform}-{scenario}-{stream}'
+ git-revision: false
+ block: true
+ - trigger-builds:
+ - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO='{scenario}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - trigger-builds:
+ - project: 'yardstick-apex-opnfv-jump-1-daily-{stream}'
+ block: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- job-template:
name: 'apex-build-{stream}'
@@ -312,6 +323,7 @@
- "apex-verify.*"
- "apex-deploy.*"
- "apex-build.*"
+ - "apex-runner.*"
triggers:
- 'apex-{stream}'
@@ -330,6 +342,8 @@
block: true
- trigger-builds:
- project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'
@@ -350,6 +364,8 @@
block: true
- trigger-builds:
- project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+ predefined-parameters:
+ DEPLOY_SCENARIO=os-onos-nofeature-ha
block: true
block-thresholds:
build-step-failure-threshold: 'never'
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index 108485d0b..bf355973c 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -10,17 +10,12 @@ echo
# Remove previous running containers if exist
-if [[ ! -z $(docker ps -a | grep $DOCKER_REPO_NAME) ]]; then
+if [[ -n "$(docker ps -a | grep $DOCKER_REPO_NAME)" ]]; then
echo "Removing existing $DOCKER_REPO_NAME containers..."
- #docker ps | grep $DOCKER_REPO_NAME | awk '{print $1}' | xargs docker stop
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 ]]; do
- ids=$(docker ps | grep $DOCKER_REPO_NAME |awk '{print $1}')
- if [[ -z $ids ]]; then
- break
- fi
+ while [[ $t -gt 0 ]] && [[ -n "$(docker ps| grep $DOCKER_REPO_NAME)" ]]; do
sleep 1
let t=t-1
done
@@ -28,13 +23,15 @@ fi
# Remove existing images if exist
-if [[ ! -z $(docker images | grep $DOCKER_REPO_NAME) ]]; then
+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
- echo "Removing docker image $DOCKER_REPO_NAME:$tag..."
- docker rmi -f $DOCKER_REPO_NAME:$tag
+ 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
diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index 9c627b8af..450ba938e 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -105,6 +105,7 @@
- 'qtip-cleanup'
- 'qtip-set-env'
- 'qtip-run-suite'
+ - 'qtip-pushtoDB'
triggers:
- timed: '0 0,13,15,20 * * *'
@@ -137,12 +138,31 @@
builders:
- shell: |
#!/bin/bash
- echo "The container id is:"
container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1)
- echo $container_id
- QTIP_REPO=/home/opnfv/repos/qtip
- docker exec -t ${container_id} $QTIP_REPO/docker/run_qtip.sh
+ if [[ ! -z ${container_id} ]]; then
+ echo "The container ID is: ${container_id}"
+ QTIP_REPO=/home/opnfv/repos/qtip
+ docker exec -t ${container_id} $QTIP_REPO/docker/run_qtip.sh
+ else
+ echo "Container ID not available"
+ fi
+
+- builder:
+ name: qtip-pushtoDB
+ builders:
+ - shell: |
+ #!/bin/bash
+ echo "Pushing available results to DB"
+ echo "The container id is:"
+ container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1)
+ if [[ ! -z ${container_id} ]]; then
+ echo "The condiner ID is: ${container_id}"
+ QTIP_REPO=/home/opnfv/repos/qtip
+ docker exec -t ${container_id} $QTIP_REPO/docker/push_db.sh
+ else
+ echo "Container ID not available"
+ fi
- builder:
name: qtip-cleanup
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 56582c90a..31243ff4e 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -127,8 +127,11 @@
grep -Eo "[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+:[0-9a-f]+")
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk {'print $1'})
sshkey="-v /root/.ssh/id_rsa:/root/.ssh/id_rsa"
- sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
- sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+ if [[ -n $(sudo iptables -L FORWARD |grep "REJECT"|grep "reject-with icmp-port-unreachable") ]]; then
+ #note: this happens only in opnfv-lf-pod1
+ sudo iptables -D FORWARD -o virbr0 -j REJECT --reject-with icmp-port-unreachable
+ sudo iptables -D FORWARD -i virbr0 -j REJECT --reject-with icmp-port-unreachable
+ fi
elif [[ ${INSTALLER_TYPE} == 'joid' ]]; then
# If production lab then creds may be retrieved dynamically
# creds are on the jumphost, always in the same folder
@@ -138,13 +141,16 @@
fi
opts="--privileged=true --rm"
- envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/}"
+ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
+ -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK} \
+ -e YARDSTICK_BRANCH=${GIT_BRANCH##origin/} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO}"
# Pull the latest image
docker pull opnfv/yardstick >$redirect
# Run docker
- cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
+ cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
+ run_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}