summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/apex/apex-deploy.sh2
-rw-r--r--jjb/compass4nfv/compass-dovetail-jobs.yml25
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml1
-rw-r--r--jjb/dovetail/dovetail-weekly-jobs.yml31
-rw-r--r--jjb/xci/bifrost-cleanup-job.yml2
-rw-r--r--jjb/xci/bifrost-periodic-jobs.yml3
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml3
-rw-r--r--jjb/xci/osa-periodic-jobs.yml3
-rw-r--r--jjb/xci/xci-daily-jobs.yml8
-rwxr-xr-xjjb/xci/xci-deploy.sh6
10 files changed, 44 insertions, 40 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 4b64fd14f..06f7622f5 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -189,7 +189,7 @@ if [[ "$JOB_NAME" == *virtual* ]]; then
# settings for virtual deployment
DEPLOY_CMD="${DEPLOY_CMD} -v"
if [[ "${DEPLOY_SCENARIO}" =~ fdio|ovs ]]; then
- DEPLOY_CMD="${DEPLOY_CMD} --virtual-default-ram 14 --virtual-compute-ram 8"
+ DEPLOY_CMD="${DEPLOY_CMD} --virtual-default-ram 12 --virtual-compute-ram 7"
fi
if [[ "$JOB_NAME" == *csit* ]]; then
DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml"
diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index d49d0ec5f..30c80e648 100644
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -6,8 +6,8 @@
#----------------------------------
# BRANCH ANCHORS
#----------------------------------
- colorado: &colorado
- stream: colorado
+ danube: &danube
+ stream: danube
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@ -20,14 +20,14 @@
pod:
- baremetal:
slave-label: compass-baremetal
- os-version: 'trusty'
- <<: *colorado
+ os-version: 'xenial'
+ <<: *danube
#-----------------------------------
# scenarios
#-----------------------------------
scenario:
- 'os-nosdn-nofeature-ha':
- disabled: false
+ disabled: true
auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
jobs:
@@ -108,17 +108,6 @@
build-step-failure-threshold: 'never'
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
- - trigger-builds:
- - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO={scenario}
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
- job-template:
name: 'compass-deploy-{pod}-weekly-{stream}'
@@ -192,13 +181,13 @@
- choice:
name: COMPASS_OPENSTACK_VERSION
choices:
- - 'mitaka'
+ - 'newton'
########################
# trigger macros
########################
- trigger:
- name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-colorado-trigger'
+ name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger'
triggers:
- timed: 'H H * * 0'
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 5651fc3f2..869048088 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -140,7 +140,6 @@
#--------------------------------
testsuite:
- 'debug'
- - 'proposed_tests'
- 'compliance_set'
jobs:
diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml
index eaa11b54a..915feb5e8 100644
--- a/jjb/dovetail/dovetail-weekly-jobs.yml
+++ b/jjb/dovetail/dovetail-weekly-jobs.yml
@@ -10,8 +10,8 @@
dovetail-branch: '{stream}'
gs-pathname: ''
docker-tag: 'latest'
- colorado: &colorado
- stream: colorado
+ danube: &danube
+ stream: danube
branch: 'stable/{stream}'
dovetail-branch: master
gs-pathname: '/{stream}'
@@ -28,40 +28,39 @@
pod:
# - baremetal:
# slave-label: apex-baremetal
-# sut: apex
-# <<: *colorado
+# SUT: apex
+# <<: *danube
- baremetal:
slave-label: compass-baremetal
- sut: compass
- <<: *colorado
+ SUT: compass
+ <<: *danube
# - baremetal:
# slave-label: fuel-baremetal
-# sut: fuel
-# <<: *master
+# SUT: fuel
+# <<: *danube
# - baremetal:
# slave-label: joid-baremetal
-# sut: joid
-# <<: *colorado
+# SUT: joid
+# <<: *danube
testsuite:
- 'debug'
- - 'proposed_tests'
- 'compliance_set'
loop:
- 'weekly':
- job-timeout: 60
+ job-timeout: 180
jobs:
- - 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}'
+ - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
################################
# job template
################################
- job-template:
- name: 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}'
+ name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
- disabled: false
+ disabled: true
concurrent: true
@@ -84,7 +83,7 @@
- project-parameter:
project: '{project}'
branch: '{dovetail-branch}'
- - '{sut}-defaults'
+ - '{SUT}-defaults'
- '{slave-label}-defaults'
- string:
name: DEPLOY_SCENARIO
diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml
index d4b2157da..d5a444d09 100644
--- a/jjb/xci/bifrost-cleanup-job.yml
+++ b/jjb/xci/bifrost-cleanup-job.yml
@@ -69,7 +69,7 @@
while [[ $try_to_rm -lt 6 ]]; do
gsutil -m rm -r $BIFROST_GS_URL && _exitcode=$? && break
_exitcode=$?
- echo "gsutil rm failed! Trying again... (attempt #$i)"
+ echo "gsutil rm failed! Trying again... (attempt #$try_to_rm)"
let try_to_rm += 1
# Give it some time...
sleep 10
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 0c29fd3c9..3e9ff678e 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -122,6 +122,9 @@
- string:
name: ANSIBLE_VERBOSITY
default: ''
+ - string:
+ name: XCI_LOOP
+ default: 'periodic'
wrappers:
- fix-workspace-permissions
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index 80c816ca1..806829620 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -140,6 +140,9 @@
- string:
name: ANSIBLE_VERBOSITY
default: '-vvvv'
+ - string:
+ name: XCI_LOOP
+ default: 'verify'
scm:
- git:
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
index 42b49411b..56a4b18b4 100644
--- a/jjb/xci/osa-periodic-jobs.yml
+++ b/jjb/xci/osa-periodic-jobs.yml
@@ -119,6 +119,9 @@
- string:
name: ANSIBLE_VERBOSITY
default: ''
+ - string:
+ name: XCI_LOOP
+ default: 'periodic'
wrappers:
- fix-workspace-permissions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index 94bfafed0..64e13d3eb 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -109,6 +109,9 @@
- label:
name: SLAVE_LABEL
default: '{slave-label}'
+ - string:
+ name: XCI_LOOP
+ default: 'daily'
triggers:
- '{auto-trigger-name}'
@@ -125,6 +128,7 @@
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
XCI_FLAVOR=$XCI_FLAVOR
+ XCI_LOOP=$XCI_LOOP
same-node: true
block: true
- trigger-builds:
@@ -133,6 +137,7 @@
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
XCI_FLAVOR=$XCI_FLAVOR
+ XCI_LOOP=$XCI_LOOP
same-node: true
block: true
block-thresholds:
@@ -205,6 +210,9 @@
- string:
name: ANSIBLE_VERBOSITY
default: ''
+ - string:
+ name: XCI_LOOP
+ default: 'daily'
builders:
- description-setter:
diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 07ca795da..b007b852f 100755
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -15,14 +15,14 @@ cd $WORKSPACE/prototypes/xci
# for daily jobs, we want to use working versions
# for periodic jobs, we will use whatever is set in the job, probably master
-if [[ "$JOB_NAME" =~ "daily" ]]; then
+if [[ "$XCI_LOOP" == "daily" ]]; then
# source pinned-vars to get releng version
source ./config/pinned-versions
# checkout the version
git checkout -q $OPNFV_RELENG_VERSION
echo "Info: Using $OPNFV_RELENG_VERSION"
-elif [[ "$JOB_NAME" =~ "periodic" ]]; then
+elif [[ "$XCI_LOOP" == "periodic" ]]; then
echo "Info: Using $OPNFV_RELENG_VERSION"
fi
@@ -31,7 +31,7 @@ fi
# to take this into account while deploying anyways
# clone openstack-ansible
# stable/ocata already use pinned versions so this is only valid for master
-if [[ "$JOB_NAME" =~ "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
+if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
cd $WORKSPACE
# get the url to openstack-ansible git
source ./config/env-vars