summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml125
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml2
-rwxr-xr-xjjb/fuel/fuel-build.sh12
-rw-r--r--jjb/fuel/fuel-ci-jobs.yml16
-rwxr-xr-xjjb/fuel/fuel-project-jobs.yml3
-rw-r--r--jjb/functest/functest-ci-jobs.yml39
-rw-r--r--jjb/joid/joid-deploy.sh2
-rw-r--r--jjb/opnfv/opnfv-docker.yml4
-rw-r--r--jjb/opnfv/slave-params.yml16
-rw-r--r--jjb/ovsnfv/ovsnfv.yml14
-rw-r--r--jjb/qtip/qtip-ci-jobs.yml18
11 files changed, 170 insertions, 81 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 26090a3a3..060cda268 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -216,15 +216,22 @@
- trigger-builds:
- project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream1}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-verify-{stream1}/build_output
+ BUILD_DIRECTORY=apex-verify-{stream1}
OPNFV_CLEAN=yes
git-revision: false
block: true
+# - trigger-builds:
+# - project: 'functest-apex-{slave}-suite-{stream1}'
+# predefined-parameters: |
+# DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+# FUNCTEST_SUITE_NAME=vping_userdata
+# block: true
- trigger-builds:
- - project: 'functest-apex-{slave}-suite-{stream1}'
+ - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}'
predefined-parameters: |
- DEPLOY_SCENARIO=os-nosdn-nofeature-ha
- FUNCTEST_SUITE_NAME=vping_userdata
+ BUILD_DIRECTORY=apex-verify-{stream1}
+ OPNFV_CLEAN=yes
+ git-revision: false
block: true
- 'apex-workspace-cleanup'
@@ -329,7 +336,7 @@
- trigger-builds:
- project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-{stream}/build_output
+ BUILD_DIRECTORY=apex-build-{stream}/build
OPNFV_CLEAN=yes
git-revision: false
block: true
@@ -429,7 +436,7 @@
# branch: branch (eg. stable)
node: '{slave}'
- disabled: false
+ disabled: true
scm:
- git-scm:
@@ -605,7 +612,7 @@
- trigger-builds:
- project: 'apex-deploy-virtual-nosdn-nofeature-ha-{stream1}'
predefined-parameters: |
- BUILD_DIRECTORY=apex-build-{stream1}/build_output
+ BUILD_DIRECTORY=apex-build-{stream1}/build
OPNFV_CLEAN=yes
git-revision: true
block: true
@@ -628,6 +635,30 @@
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
+- job-template:
+ name: 'apex-gs-clean-{stream}'
+
+ # Job template for clean
+ #
+ # Required Variables:
+ # stream: branch with - in place of / (eg. stable)
+ node: '{slave}'
+
+ disabled: false
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ - apex-parameter:
+ gs-pathname: '{gs-pathname}'
+
+ builders:
+ - 'apex-gs-clean'
+
+ triggers:
+ - 'apex-gs-clean-{stream}'
+
+
########################
# parameter macros
########################
@@ -644,7 +675,7 @@
description: "Artifact version type"
- string:
name: BUILD_DIRECTORY
- default: $WORKSPACE/build_output
+ default: $WORKSPACE/build
description: "Directory where the build artifact will be located upon the completion of the build."
- string:
name: CACHE_DIRECTORY
@@ -708,7 +739,7 @@
# start the build
cd $WORKSPACE/ci
./build.sh $BUILD_ARGS
- RPM_VERSION=$(grep Version $BUILD_DIRECTORY/../build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
+ RPM_VERSION=$(grep Version: $BUILD_DIRECTORY/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-')
# list the contents of BUILD_OUTPUT directory
ls -al $BUILD_DIRECTORY
# save information regarding artifact into file
@@ -717,10 +748,10 @@
echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
- echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
+ echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)"
echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.src.rpm"
echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$RPM_VERSION.noarch.rpm"
- echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
+ echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/noarch/opnfv-apex-$RPM_VERSION.noarch.rpm | cut -d' ' -f1)"
echo "OPNFV_BUILD_URL=$BUILD_URL"
) > $WORKSPACE/opnfv.properties
echo "--------------------------------------------------------"
@@ -756,16 +787,17 @@
source $WORKSPACE/opnfv.properties
# upload artifact and additional files to google storage
- gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
- RPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL)
- RPM_LIST=$RPM_INSTALL_PATH
- for pkg in common undercloud opendaylight-sfc; do
- RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+ gsutil cp $BUILD_DIRECTORY/release/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1
+ RPM_INSTALL_PATH=$BUILD_DIRECTORY/noarch
+ RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
+ VERSION_EXTENSION=$(echo $(basename $OPNFV_RPM_URL) | sed 's/opnfv-apex-//')
+ for pkg in common undercloud opendaylight-sfc onos; do
+ RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
- SRPM_INSTALL_PATH=$BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL)
- SRPM_LIST=$SRPM_INSTALL_PATH
- for pkg in common undercloud opendaylight-sfc; do
- SRPM_LIST+=" ${SRPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+ SRPM_INSTALL_PATH=$BUILD_DIRECTORY
+ SRPM_LIST=$SRPM_INSTALL_PATH/$(basename $OPNFV_SRPM_URL)
+ for pkg in common undercloud opendaylight-sfc onos; do
+ SRPM_LIST+=" ${SRPM_INSTALL_PATH}/opnfv-apex/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
for artifact in $RPM_LIST $SRPM_LIST; do
gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.iso.log 2>&1
@@ -780,6 +812,30 @@
echo "RPM Artifact is available as http://$GS_URL/$(basename $OPNFV_RPM_URL)"
- builder:
+ name: 'apex-gs-cleanup'
+ builders:
+ - shell: |
+ #!/bin/bash
+ set -o errexit
+ set -o nounset
+ set -o pipefail
+
+ # log info to console
+ echo "Cleaning Google Storage"
+ echo "-----------------------"
+ echo
+
+ thirty_days_ago=$(date -d "30 days ago" +"%Y%m%d")
+
+ for i in $(gsutil ls gs://$GS_URL/*201?*); do
+ filedate=$(date -d "$(echo $i | grep -Eo 201[0-9]-?[0-9][0-9]-?[0-9][0-9])" +"%Y%m%d")
+ if [ $filedate -lt $thirty_days_ago ]; then
+ # gsutil indicates what it is removing so no need for output here
+ gsutil rm $i
+ fi
+ done
+
+- builder:
name: 'apex-deploy-virtual'
builders:
- shell: |
@@ -801,7 +857,8 @@
elif [[ ! "$ARTIFACT_NAME" == "latest" ]]; then
# if artifact name is passed the pull a
# specific artifact from artifacts.opnfv.org
- RPM_INSTALL_PATH=$GS_URL/$ARTIFACT_NAME
+ RPM_INSTALL_PATH=$GS_URL
+ RPM_LIST=$RPM_INSTALL_PATH/$ARTIFACT_NAME
else
if [[ $BUILD_DIRECTORY == *verify* ]]; then
BUILD_DIRECTORY=$WORKSPACE/../$BUILD_DIRECTORY
@@ -815,7 +872,8 @@
# if opnfv.properties exists then use the
# local build. Source the file so we get local OPNFV vars
source ${BUILD_DIRECTORY}/../opnfv.properties
- RPM_INSTALL_PATH=${BUILD_DIRECTORY}/$(basename $OPNFV_RPM_URL)
+ RPM_INSTALL_PATH=${BUILD_DIRECTORY}/noarch
+ RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
else
if [[ $BUILD_DIRECTORY == *verify* ]]; then
echo "BUILD_DIRECTORY is from a verify job, so will not use latest from URL"
@@ -832,7 +890,8 @@
[[ -f opnfv.properties ]] || exit 1
# source the file so we get OPNFV vars
source opnfv.properties
- RPM_INSTALL_PATH=$OPNFV_RPM_URL
+ RPM_INSTALL_PATH=$(echo $OPNFV_RPM_URL | sed 's/'"$(basename $OPNFV_RPM_URL)"'//')
+ RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
fi
fi
@@ -844,7 +903,7 @@
# use local build for verify
if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
if [ ! -e "${WORKSPACE}/build/lib" ]; then ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib; fi
- DEPLOY_CMD="./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
+ DEPLOY_CMD="CONFIG=${WORKSPACE}/build RESOURCES=${WORKSPACE}/build/images/ ./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
DEPLOY_FILE="${WORKSPACE}/config/deploy/${DEPLOY_SCENARIO}.yaml"
NETWORK_FILE="${WORKSPACE}/config/network/network_settings.yaml"
# Make sure python34 is installed
@@ -862,15 +921,21 @@
exit 1
fi
fi
+ if ! rpm -q python34-setuptools > /dev/null; then
+ if ! sudo yum install -y python34-setuptools; then
+ echo "Failed to install python34-setuptools"
+ exit 1
+ fi
+ fi
if [ -z ${PYTHONPATH:-} ]; then
export PYTHONPATH=${WORKSPACE}/lib/python
else
export PYTHONPATH=$PYTHONPATH:${WORKSPACE}/lib/python
fi
else
- RPM_LIST=$RPM_INSTALL_PATH
- for pkg in common undercloud opendaylight-sfc; do
- RPM_LIST+=" ${RPM_INSTALL_PATH/opnfv-apex/opnfv-apex-${pkg}}"
+ VERSION_EXTENSION=$(echo $(basename $RPM_LIST) | sed 's/opnfv-apex-//')
+ for pkg in common undercloud opendaylight-sfc onos; do
+ RPM_LIST+=" ${RPM_INSTALL_PATH}/opnfv-apex/opnfv-apex-${pkg}-${VERSION_EXTENSION}"
done
# update / install the new rpm
@@ -893,7 +958,7 @@
if [ "$OPNFV_CLEAN" == 'yes' ]; then
if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
- sudo ./clean.sh
+ sudo CONFIG=../lib ./clean.sh
else
sudo opnfv-clean
fi
@@ -1010,3 +1075,7 @@
name: 'apex-brahmaputra'
triggers:
- timed: '0 3 * * *'
+- trigger:
+ name: 'apex-gs-clean-{stream}'
+ triggers:
+ - timed: '0 2 * * *'
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 9d881233d..deeebfdf4 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -23,7 +23,7 @@
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
gs-packagepath: '/{stream}/{suite}'
- docker-tag: 'brahmaputra'
+ docker-tag: 'stable'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index eaf1f83e7..95ebaa5a9 100755
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -35,11 +35,13 @@ CURRENT_SHA1=$(git rev-parse HEAD)
FORCE_BUILD=${FORCE_BUILD:-false}
if [[ "$CURRENT_SHA1" == "$LATEST_ISO_SHA1" && "$FORCE_BUILD" == "false" ]]; then
- echo "An ISO has already been built for this commit"
- echo " $LATEST_ISO_URL"
- echo "Nothing new to build. Exiting."
- touch $WORKSPACE/.noupload
- exit 0
+ echo "***************************************************"
+ echo " An ISO has already been built for this commit"
+ echo " $LATEST_ISO_URL"
+ echo "***************************************************"
+# echo "Nothing new to build. Exiting."
+# touch $WORKSPACE/.noupload
+# exit 0
else
echo "This commit has not been built yet or forced build! Proceeding with the build."
/bin/rm -f $LATEST_ISO_PROPERTIES
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index e1816b528..77b711e74 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -278,35 +278,35 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 12 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 15 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 21 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-bgpvpn-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 0 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-odl_l2-sfc-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 3 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 6 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: ''
- trigger:
name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger'
triggers:
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index 0d768203f..f377c9bed 100755
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -60,8 +60,7 @@
branch: '{branch}'
triggers:
- - pollscm:
- cron: '0 H/4 * * *'
+ - timed: '0 H/4 * * *'
wrappers:
- timeout:
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index a0a1326ba..bbdba9fa3 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -55,6 +55,9 @@
- virtual:
installer: joid
<<: *brahmaputra
+ - arm-pod1:
+ installer: fuel
+ <<: *brahmaputra
#--------------------------------
# master
#--------------------------------
@@ -194,7 +197,7 @@
description: "Push the results of all the tests to the resultDB"
- string:
name: CI_DEBUG
- default: 'false'
+ default: 'true'
description: "Show debug output information"
########################
# trigger macros
@@ -221,8 +224,13 @@
- shell: |
#!/bin/bash
set -e
- echo "Functest: run $FUNCTEST_SUITE_NAME"
- cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
+ branch=${GIT_BRANCH##*/}
+ echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}"
+ if [[ ${branch} == *"brahmaputra"* ]]; then
+ cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
+ else
+ cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
+ fi
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
@@ -232,9 +240,13 @@
- shell: |
#!/bin/bash
set +e
- flags="-s"
- [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
- cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}"
+ branch=${GIT_BRANCH##*/}
+ [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
+ if [[ ${branch} == *"brahmaputra"* ]]; then
+ cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
+ else
+ cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
+ fi
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
@@ -282,14 +294,15 @@
mkdir -p ${dir_result}
sudo rm -rf ${dir_result}/*
res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+ custom_params=
+ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG})
echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
- docker pull opnfv/functest:$DOCKER_TAG >${redirect}
+ docker pull opnfv/functest:$DOCKER_TAG >/dev/null
- cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash"
+ cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} ${custom_params} opnfv/functest:${DOCKER_TAG} /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd} >${redirect}
- docker ps -a >${redirect}
sleep 5
container_id=$(docker ps | grep "opnfv/functest:${DOCKER_TAG}" | awk '{print $1}' | head -1)
echo "Container ID=${container_id}"
@@ -306,7 +319,11 @@
echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
exit 1
fi
- cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+ if [[ ${branch} == *"brahmaputra"* ]]; then
+ cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+ else
+ cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
+ fi
echo "Executing command inside the docker: ${cmd}"
docker exec ${container_id} ${cmd}
@@ -337,6 +354,6 @@
image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
for tag in "${image_tags[@]}"; do
echo "Removing docker image opnfv/functest:$tag..."
- docker rmi opnfv/functest:$tag >${redirect}
+ docker rmi opnfv/functest:$tag >/dev/null
done
fi
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 59ba01588..149447733 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -50,8 +50,6 @@ fi
case $NODE_NAME in
orange-fr-pod2)
POD=orange-pod2 ;;
- juniper-us-test-1)
- POD=juniper-pod1 ;;
*virtual*)
POD=default ;;
*)
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 130edd480..936f22040 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -40,7 +40,7 @@
description: "To enable/disable pushing the image to Dockerhub."
- string:
name: BASE_VERSION
- default: "brahmaputra.1"
+ default: "brahmaputra.3"
description: "Base version to be used."
- string:
name: DOCKER_REPO_NAME
@@ -83,7 +83,7 @@
description: "To enable/disable pushing the image to Dockerhub."
- string:
name: BASE_VERSION
- default: "brahmaputra.2"
+ default: "brahmaputra.3"
description: "Base version to be used."
- string:
name: DOCKER_REPO_NAME
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 2ca4459dd..5892e7c96 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -415,9 +415,9 @@
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - juniper-us-test-1
+ - juniper-pod1
default-slaves:
- - juniper-us-test-1
+ - juniper-pod1
- string:
name: INSTALLER_VERSION
default: latest
@@ -523,15 +523,15 @@
description: 'SSH key to use for Apex'
- parameter:
- name: 'dell-us-testing-bm-1-defaults'
+ name: 'dell-pod1-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - dell-us-testing-bm-1
+ - dell-pod1
default-slaves:
- - dell-us-testing-bm-1
+ - dell-pod1
- string:
name: INSTALLER_VERSION
default: latest
@@ -542,15 +542,15 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'dell-us-deploying-bm3-defaults'
+ name: 'dell-pod2-defaults'
parameters:
- node:
name: SLAVE_NAME
description: 'Slave name on Jenkins'
allowed-slaves:
- - dell-us-deploying-bm3
+ - dell-pod2
default-slaves:
- - dell-us-deploying-bm3
+ - dell-pod2
- string:
name: INSTALLER_VERSION
default: latest
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index 8a119d9fb..6f6d29012 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -85,6 +85,11 @@
refspec: ''
choosing-strategy: 'default'
+ wrappers:
+ - timeout:
+ timeout: 24
+ fail: true
+
triggers:
- gerrit:
trigger-on:
@@ -126,6 +131,11 @@
refspec: ''
branch: '{branch}'
+ wrappers:
+ - timeout:
+ timeout: 24
+ fail: true
+
triggers:
- timed: '@midnight'
@@ -138,3 +148,7 @@
cd $WORKSPACE/ci
./build.sh
+
+ publishers:
+ - email:
+ recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com
diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml
index 8dd0a4af0..44bdd7138 100644
--- a/jjb/qtip/qtip-ci-jobs.yml
+++ b/jjb/qtip/qtip-ci-jobs.yml
@@ -23,19 +23,14 @@
# brahmaputra
#--------------------------------
pod:
- - dell-us-testing-bm-1:
+ - dell-pod1:
installer: compass
- auto-trigger-name: 'qtip-daily-dell-us-testing-bm-1-trigger'
+ auto-trigger-name: 'qtip-daily-dell-pod1-trigger'
<<: *brahmaputra
- orange-pod2:
installer: joid
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
<<: *brahmaputra
- - dell-us-deploying-bm3:
- installer: fuel
- auto-trigger-name: 'qtip-daily-dell-us-deploying-bm3-trigger'
- <<: *brahmaputra
-
#--------------------------------
# master
#--------------------------------
@@ -171,17 +166,12 @@
#################
- trigger:
- name: 'qtip-daily-dell-us-deploying-bm3-trigger'
- triggers:
- - timed: '0 0 * * *'
-
-- trigger:
- name: 'qtip-daily-dell-us-testing-bm-1-trigger'
+ name: 'qtip-daily-dell-pod1-trigger'
triggers:
- timed: '0 3 * * *'
#- trigger:
-# name: 'qtip-daily-juniper-build1-trigger'
+# name: 'qtip-daily-juniper-pod1-trigger'
# triggers:
# - timed : '0 0 * * *'