summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml6
-rw-r--r--jjb/compass4nfv/compass-verify-jobs.yml6
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml2
-rw-r--r--jjb/qtip/helpers/cleanup-deploy.sh15
-rw-r--r--jjb/qtip/helpers/validate-deploy.sh7
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml5
6 files changed, 23 insertions, 18 deletions
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 9b13e693a..f962518e0 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -12,10 +12,12 @@
- master:
branch: '{stream}'
gs-pathname: ''
+ ppa-pathname: '/{stream}'
disabled: false
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ ppa-pathname: '/{stream}'
disabled: false
jobs:
@@ -47,6 +49,7 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
+ ppa-pathname: '{ppa-pathname}'
- 'opnfv-build-ubuntu-defaults'
- '{installer}-defaults'
@@ -90,6 +93,7 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
+ ppa-pathname: '{ppa-pathname}'
- '{node}-defaults'
- '{installer}-defaults'
scm:
@@ -121,7 +125,7 @@
description: "URL to Google Storage."
- string:
name: PPA_REPO
- default: "http://205.177.226.237:9999{gs-pathname}"
+ default: "http://205.177.226.237:9999{ppa-pathname}"
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index e625c686a..14279e649 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -11,10 +11,12 @@
- master:
branch: '{stream}'
gs-pathname: ''
+ ppa-pathname: '/{stream}'
disabled: false
- danube:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ ppa-pathname: '/{stream}'
disabled: false
distro:
@@ -111,6 +113,7 @@
- 'compass-verify-defaults':
installer: '{installer}'
gs-pathname: '{gs-pathname}'
+ ppa-pathname: '{ppa-pathname}'
- string:
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
@@ -229,6 +232,7 @@
- 'compass-verify-defaults':
installer: '{installer}'
gs-pathname: '{gs-pathname}'
+ ppa-pathname: '{ppa-pathname}'
- string:
name: DEPLOY_SCENARIO
default: 'k8-nosdn-nofeature-ha'
@@ -335,7 +339,7 @@
description: "URL to Google Storage."
- string:
name: PPA_REPO
- default: "http://205.177.226.237:9999{gs-pathname}"
+ default: "http://205.177.226.237:9999{ppa-pathname}"
- string:
name: PPA_CACHE
default: "$WORKSPACE/work/repo/"
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index 12456ddbb..32abad624 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -747,7 +747,7 @@
- trigger:
name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-master-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-master-trigger'
triggers:
diff --git a/jjb/qtip/helpers/cleanup-deploy.sh b/jjb/qtip/helpers/cleanup-deploy.sh
index 95babb318..9cb19a583 100644
--- a/jjb/qtip/helpers/cleanup-deploy.sh
+++ b/jjb/qtip/helpers/cleanup-deploy.sh
@@ -7,20 +7,15 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# Remove previous running containers if exist
-if [[ ! -z $(docker ps -a | grep opnfv/qtip) ]]; then
+if [[ ! -z $(docker ps -a | grep "opnfv/qtip:$DOCKER_TAG") ]]; then
echo "Removing existing opnfv/qtip containers..."
# workaround: sometimes it throws an error when stopping qtip container.
# To make sure ci job unblocked, remove qtip container by force without stopping it.
- docker rm -f $(docker ps -a | grep opnfv/qtip | awk '{print $1}')
+ docker rm -f $(docker ps -a | grep "opnfv/qtip:$DOCKER_TAG" | awk '{print $1}')
fi
# Remove existing images if exist
-if [[ ! -z $(docker images | grep opnfv/qtip) ]]; then
- echo "Docker images to remove:"
- docker images | head -1 && docker images | grep opnfv/qtip
- image_tags=($(docker images | grep opnfv/qtip | awk '{print $2}'))
- for tag in "${image_tags[@]}"; do
- echo "Removing docker image opnfv/qtip:$tag..."
- docker rmi opnfv/qtip:$tag
- done
+if [[ $(docker images opnfv/qtip:${DOCKER_TAG} | wc -l) -gt 1 ]]; then
+ echo "Removing docker image opnfv/qtip:$DOCKER_TAG..."
+ docker rmi opnfv/qtip:$DOCKER_TAG
fi
diff --git a/jjb/qtip/helpers/validate-deploy.sh b/jjb/qtip/helpers/validate-deploy.sh
index aa07986ce..9f3dbe414 100644
--- a/jjb/qtip/helpers/validate-deploy.sh
+++ b/jjb/qtip/helpers/validate-deploy.sh
@@ -11,6 +11,7 @@ set -e
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}
-e NODE_NAME=${NODE_NAME} -e CI_DEBUG=${CI_DEBUG}"
ramfs=/tmp/qtip/ramfs
+cfg_dir=$(dirname $ramfs)
dir_imgstore="${HOME}/imgstore"
ramfs_volume="$ramfs:/mnt/ramfs"
@@ -28,12 +29,12 @@ if [ ! -d $ramfs ]; then
mkdir -p $ramfs
fi
-if [ ! -z $(df $ramfs | tail -n -1 | grep $ramfs) ]; then
+if [ ! -z "$(df $ramfs | tail -n -1 | grep $ramfs)" ]; then
sudo mount -t tmpfs -o size=32M tmpfs $ramfs
fi
# enable contro path in docker
-echo <<EOF > /tmp/ansible.cfg
+cat <<EOF > ${cfg_dir}/ansible.cfg
[defaults]
callback_whitelist = profile_tasks
[ssh_connection]
@@ -51,7 +52,7 @@ if [ $(docker ps | grep 'opnfv/qtip' | wc -l) == 0 ]; then
else
echo "The container ID is: ${container_id}"
QTIP_REPO=/home/opnfv/repos/qtip
- docker cp /tmp/ansible.cfg ${container_id}:/home/opnfv/.ansible.cfg
+ docker cp ${cfg_dir}/ansible.cfg ${container_id}:/home/opnfv/.ansible.cfg
# TODO(zhihui_wu): use qtip cli to execute benchmark test in the future
docker exec -t ${container_id} bash -c "cd ${QTIP_REPO}/qtip/runner/ &&
python runner.py -d /home/opnfv/qtip/results/ -b all"
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index e1b71f516..8dd97de1d 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -95,9 +95,10 @@
name: qtip-validate-deploy
builders:
- shell:
- !include-raw: ./helpers/validate-deploy.sh
- - shell:
!include-raw: ./helpers/cleanup-deploy.sh
+ - shell:
+ !include-raw: ./helpers/validate-deploy.sh
+
#-----------
# parameter