summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml85
-rw-r--r--jjb/bottlenecks/bottlenecks.yml4
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml4
-rw-r--r--jjb/fuel/fuel-project-jobs.yml6
-rw-r--r--jjb/joid/joid-ci-jobs.yml22
-rw-r--r--jjb/kvmfornfv/kvmfornfv.yml14
-rw-r--r--jjb/opnfv/opnfv-docker.sh15
-rw-r--r--jjb/opnfv/opnfv-docker.yml7
-rw-r--r--jjb/opnfv/slave-params.yml50
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml2
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml4
11 files changed, 92 insertions, 121 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 2719b3a47..acc0550fb 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -14,10 +14,12 @@
- master:
branch: 'master'
gs-pathname: ''
+ block-stream: 'brahmaputra'
- brahmaputra:
branch: 'stable/brahmaputra'
gs-pathname: '/brahmaputra'
- disabled: true
+ block-stream: 'master'
+ disabled: false
project: 'apex'
@@ -94,25 +96,26 @@
- "apex-deploy.*"
- "apex-build.*"
- "apex-runner.*"
+ - 'apex-verify-{block-stream}'
builders:
- 'apex-build'
- trigger-builds:
- project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
predefined-parameters:
- BUILD_DIRECTORY=apex-verify-master/build_output
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
git-revision: false
block: true
- trigger-builds:
- project: 'apex-deploy-virtual-os-onos-nofeature-ha-{stream}'
predefined-parameters:
- BUILD_DIRECTORY=apex-verify-master/build_output
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
git-revision: false
block: true
- trigger-builds:
- project: 'apex-deploy-virtual-os-odl_l3-nofeature-ha-{stream}'
predefined-parameters:
- BUILD_DIRECTORY=apex-verify-master/build_output
+ BUILD_DIRECTORY=apex-verify-{stream}/build_output
git-revision: false
block: true
- 'apex-workspace-cleanup'
@@ -159,7 +162,7 @@
- trigger-builds:
- project: 'functest-apex-opnfv-jump-1-daily-{stream}'
predefined-parameters:
- DEPLOY_SCENARIO='{scenario}'
+ DEPLOY_SCENARIO={scenario}
block: true
block-thresholds:
build-step-failure-threshold: 'never'
@@ -214,7 +217,7 @@
- trigger-builds:
- project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
predefined-parameters:
- BUILD_DIRECTORY=apex-build-master/build_output
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
git-revision: false
block: true
- 'apex-upload-artifact'
@@ -343,7 +346,7 @@
- trigger-builds:
- project: 'apex-deploy-baremetal-os-odl_l2-nofeature-ha-{stream}'
predefined-parameters:
- BUILD_DIRECTORY=apex-build-master/build_output
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
git-revision: true
block: true
- trigger-builds:
@@ -365,7 +368,7 @@
- trigger-builds:
- project: 'apex-deploy-baremetal-os-onos-nofeature-ha-{stream}'
predefined-parameters:
- BUILD_DIRECTORY=apex-build-master/build_output
+ BUILD_DIRECTORY=apex-build-{stream}/build_output
git-revision: true
block: true
- trigger-builds:
@@ -384,28 +387,28 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- - trigger-builds:
- - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
- predefined-parameters:
- BUILD_DIRECTORY=apex-build-master/build_output
- git-revision: true
- block: true
- - trigger-builds:
- - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
- predefined-parameters:
- DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
- 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'
+# - trigger-builds:
+# - project: 'apex-deploy-baremetal-os-odl_l3-nofeature-ha-{stream}'
+# predefined-parameters:
+# BUILD_DIRECTORY=apex-build-master/build_output
+# git-revision: true
+# block: true
+# - trigger-builds:
+# - project: 'functest-apex-opnfv-jump-1-daily-{stream}'
+# predefined-parameters:
+# DEPLOY_SCENARIO=os-odl_l3-nofeature-ha
+# 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'
########################
# parameter macros
@@ -456,16 +459,20 @@
# create the cache directory if it doesn't exist
[[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY
# set OPNFV_ARTIFACT_VERSION
- if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
- export OPNFV_ARTIFACT_VERSION="bramaputra.1.rc0"
- else
- if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+ if echo $BUILD_TAG | grep "apex-verify" 1> /dev/null; then
+ if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+ export OPNFV_ARTIFACT_VERSION=brahmaputra-dev${BUILD_NUMBER}
+ else
export OPNFV_ARTIFACT_VERSION=dev${BUILD_NUMBER}
- elif [ "$ARTIFACT_VERSION" == "daily" ]; then
- export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
+ fi
+ elif [ "$ARTIFACT_VERSION" == "daily" ]; then
+ if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+ export OPNFV_ARTIFACT_VERSION=brahmaputra-$(date -u +"%Y-%m-%d")
else
- export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
+ export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d")
fi
+ else
+ export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
fi
# start the build
cd $WORKSPACE/ci
@@ -730,8 +737,8 @@
- trigger:
name: 'apex-master'
triggers:
- - timed: '0 3 * * *'
+ - timed: '0 3 * 12 *'
- trigger:
name: 'apex-brahmaputra'
triggers:
- - timed: '0 6 * * 2050'
+ - timed: '0 3 * * *'
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml
index 26069cf7b..a65330d5d 100644
--- a/jjb/bottlenecks/bottlenecks.yml
+++ b/jjb/bottlenecks/bottlenecks.yml
@@ -78,8 +78,6 @@
- job-template:
name: 'bottlenecks-{suite}-upload-artifacts-{stream}'
- node: ericsson-build
-
concurrent: true
properties:
@@ -91,7 +89,7 @@
parameters:
- project-parameter:
project: '{project}'
- - 'ericsson-ca-build-1-defaults'
+ - 'ericsson-build-defaults'
- bottlenecks-parameter:
gs-pathname: '{gs-pathname}'
suite: '{suite}'
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index d155b848f..8943afb37 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -129,8 +129,6 @@
- job-template:
name: 'compass-build-iso-{stream}'
- node: ericsson-build
-
concurrent: true
properties:
@@ -145,7 +143,7 @@
- compass-project-parameter:
installer: '{installer}'
gs-pathname: '{gs-pathname}'
- - '{node}-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
scm:
diff --git a/jjb/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml
index c784d472c..0ba8e3ff1 100644
--- a/jjb/fuel/fuel-project-jobs.yml
+++ b/jjb/fuel/fuel-project-jobs.yml
@@ -42,7 +42,7 @@
parameters:
- project-parameter:
project: '{project}'
- - 'fuel-build-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
@@ -86,7 +86,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'fuel-build-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
@@ -152,7 +152,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'fuel-build-defaults'
+ - 'ericsson-build-defaults'
- '{installer}-defaults'
- fuel-project-parameter:
gs-pathname: '{gs-pathname}'
diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml
index 946785d91..909a885ab 100644
--- a/jjb/joid/joid-ci-jobs.yml
+++ b/jjb/joid/joid-ci-jobs.yml
@@ -53,7 +53,7 @@
- 'os-odl_l2-nofeature-noha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-onos-nofeature-ha':
- auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+ auto-trigger-name: 'joid-{scenario}-{pod}-trigger'
- 'os-onos-nofeature-noha':
auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
- 'os-ocl-nofeature-ha':
@@ -210,3 +210,23 @@
name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'joid-os-onos-nofeature-ha-intel-pod5-trigger'
+ triggers:
+ - timed: '0 14 * * *'
+- trigger:
+ name: 'joid-os-onos-nofeature-ha-intel-pod6-trigger'
+ triggers:
+ - timed: '0 14 * * *'
+- trigger:
+ name: 'joid-os-onos-nofeature-ha-orange-pod2-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'joid-os-onos-nofeature-ha-juniper-pod1-trigger'
+ triggers:
+ - timed: ''
+- trigger:
+ name: 'joid-os-onos-nofeature-ha-virtual-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 34793adf6..b042c56a7 100644
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -18,17 +18,12 @@
- job-template:
name: 'kvmfornfv-verify-{stream}'
- node: ericsson-build
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm:
@@ -62,17 +57,12 @@
- job-template:
name: 'kvmfornfv-merge-{stream}'
- node: ericsson-build
-
parameters:
- project-parameter:
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm:
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index adb519394..4089a6ff3 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -94,11 +94,11 @@ echo "Tag version to be build and pushed: $DOCKER_TAG"
# Start the build
-echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG..."
+echo "Building docker image: $DOCKER_REPO_NAME:latest"
-docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG .
-echo "Creating tag 'latest'..."
-docker tag $DOCKER_REPO_NAME:$DOCKER_TAG $DOCKER_REPO_NAME:latest
+docker build --no-cache -t $DOCKER_REPO_NAME:latest .
+echo "Creating tag '$DOCKER_TAG'..."
+docker tag -f $DOCKER_REPO_NAME:latest $DOCKER_REPO_NAME:$DOCKER_TAG
# list the images
echo "Available images are:"
@@ -110,8 +110,9 @@ if [[ "$PUSH_IMAGE" == "true" ]]; then
echo "--------------------------------------------------------"
echo
# Push to the Dockerhub repository
- docker push $DOCKER_REPO_NAME:$DOCKER_TAG
-
- echo "Updating $DOCKER_REPO_NAME:latest to the docker registry..."
+ echo "Pushing $DOCKER_REPO_NAME:latest ..."
docker push $DOCKER_REPO_NAME:latest
+
+ echo "Pushing $DOCKER_REPO_NAME:$DOCKER_TAG ..."
+ docker push $DOCKER_REPO_NAME:$DOCKER_TAG
fi
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index c16e33eda..04dcf832f 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -27,17 +27,12 @@
- job-template:
name: '{project}-docker-build-push-{stream}'
- node: ericsson-build
-
disabled: false
parameters:
- project-parameter:
project: '{project}'
- - string:
- name: GIT_BASE
- default: "https://gerrit.opnfv.org/gerrit/$PROJECT"
- description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'ericsson-build-defaults'
- string:
name: PUSH_IMAGE
default: "true"
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index daa4a4f1e..e1f9e448b 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -194,24 +194,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'ericsson-build-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - ericsson-build
- default-slaves:
- - ericsson-build
- - string:
- name: INSTALLER_VERSION
- default: stable
- description: 'Version of the installer to deploy'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-- parameter:
name: 'huawei-build-defaults'
parameters:
- node:
@@ -267,15 +249,10 @@
- parameter:
name: 'opnfv-build-defaults'
parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - intel-us-build-1
- - ericsson-ca-build-1
- default-slaves:
- - intel-us-build-1
- - ericsson-ca-build-1
+ - label:
+ name: SLAVE_LABEL
+ default: 'opnfv-build'
+ description: 'Slave label on Jenkins'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -316,21 +293,6 @@
description: 'Git URL to use on this Jenkins Slave'
- parameter:
- name: 'ericsson-ca-build-1-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - ericsson-ca-build-1
- default-slaves:
- - ericsson-ca-build-1
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
name: 'zte-build-1-defaults'
parameters:
- node:
@@ -426,11 +388,11 @@
description: 'Git URL to use on these Jenkins Slaves'
- parameter:
- name: 'fuel-build-defaults'
+ name: 'ericsson-build-defaults'
parameters:
- label:
name: SLAVE_LABEL
- default: 'fuel-build'
+ default: 'ericsson-build'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 779886d03..c5c269d16 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -94,7 +94,7 @@
installer: fuel
suite: daily
<<: *master
- - virtual:
+ - huawei-virtual:
installer: compass
suite: daily
<<: *master
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index 4f978e189..aa02c8752 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -31,7 +31,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'ericsson-ca-build-1-defaults'
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm:
@@ -80,7 +80,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'ericsson-ca-build-1-defaults'
+ - 'ericsson-build-defaults'
scm:
- gerrit-trigger-scm: