summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/copper/copper.yml2
-rwxr-xr-xjjb/daisy4nfv/daisy4nfv-download-artifact.sh4
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml36
-rw-r--r--jjb/functest/functest-ci-jobs.yml1
-rw-r--r--jjb/global/releng-macros.yml4
-rw-r--r--jjb/infra/bifrost-cleanup-job.yml20
-rw-r--r--jjb/models/models.yml2
-rw-r--r--jjb/multisite/multisite-daily-jobs.yml4
-rw-r--r--jjb/opnfvdocs/docs-rtd.yaml2
-rw-r--r--jjb/ves/ves.yml4
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml2
11 files changed, 36 insertions, 45 deletions
diff --git a/jjb/copper/copper.yml b/jjb/copper/copper.yml
index b65466e01..e380fd555 100644
--- a/jjb/copper/copper.yml
+++ b/jjb/copper/copper.yml
@@ -64,4 +64,4 @@
set -o nounset
set -o pipefail
- shellcheck -f tty tests/*.sh
+ # shellcheck -f tty tests/*.sh
diff --git a/jjb/daisy4nfv/daisy4nfv-download-artifact.sh b/jjb/daisy4nfv/daisy4nfv-download-artifact.sh
index 90b5fa62f..b9af2e8ad 100755
--- a/jjb/daisy4nfv/daisy4nfv-download-artifact.sh
+++ b/jjb/daisy4nfv/daisy4nfv-download-artifact.sh
@@ -12,7 +12,7 @@ set -o errexit
set -o pipefail
# use proxy url to replace the nomral URL, for googleusercontent.com will be blocked randomly
-[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=$GS_BASE_PROXY
+[[ "$NODE_NAME" =~ (zte) ]] && GS_URL=${GS_BASE_PROXY%%/*}/$GS_URL
if [[ "$JOB_NAME" =~ "merge" ]]; then
echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
@@ -43,7 +43,7 @@ echo "--------------------------------------------------------"
echo
# download the file
-curl -s -o $WORKSPACE/opnfv.bin http://$OPNFV_ARTIFACT_URL > gsutil.bin.log 2>&1
+curl -L -s -o $WORKSPACE/opnfv.bin http://$OPNFV_ARTIFACT_URL > gsutil.bin.log 2>&1
# list the file
ls -al $WORKSPACE/opnfv.bin
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index e2a334d40..22bc28109 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -20,8 +20,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}'
@@ -54,12 +54,12 @@
slave-label: fuel-baremetal
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+ <<: *danube
- virtual:
slave-label: fuel-virtual
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+ <<: *danube
#compass CI PODs
- baremetal:
slave-label: compass-baremetal
@@ -75,12 +75,12 @@
slave-label: compass-baremetal
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+ <<: *danube
- virtual:
slave-label: compass-virtual
SUT: compass
auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+ <<: *danube
#apex CI PODs
- apex-verify-master:
slave-label: '{pod}'
@@ -92,16 +92,16 @@
SUT: apex
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
- - apex-verify-colorado:
- slave-label: '{pod}'
- SUT: apex
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
- - apex-daily-colorado:
- slave-label: '{pod}'
- SUT: apex
- auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+# - apex-verify-colorado:
+# slave-label: '{pod}'
+# SUT: apex
+# auto-trigger-name: 'daily-trigger-disabled'
+# <<: *danube
+# - apex-daily-colorado:
+# slave-label: '{pod}'
+# SUT: apex
+# auto-trigger-name: 'daily-trigger-disabled'
+# <<: *danube
#armband CI PODs
- armband-baremetal:
slave-label: armband-baremetal
@@ -117,12 +117,12 @@
slave-label: armband-baremetal
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+ <<: *danube
- armband-virtual:
slave-label: armband-virtual
SUT: fuel
auto-trigger-name: 'daily-trigger-disabled'
- <<: *colorado
+ <<: *danube
#--------------------------------
# None-CI PODs
#--------------------------------
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index e85144c92..9bf6a1a6e 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -284,6 +284,7 @@
- 'tempest_smoke_serial'
- 'rally_sanity'
- 'odl'
+ - 'odl_netvirt'
- 'onos'
- 'promise'
- 'doctor'
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index c245ee813..34f53fb5f 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -466,8 +466,8 @@
- cobertura:
report-file: "coverage.xml"
only-stable: "true"
- health-auto-update: "true"
- stability-auto-update: "true"
+ health-auto-update: "false"
+ stability-auto-update: "false"
zoom-coverage-chart: "true"
targets:
- files:
diff --git a/jjb/infra/bifrost-cleanup-job.yml b/jjb/infra/bifrost-cleanup-job.yml
index 6b761eea3..f1b38ca4b 100644
--- a/jjb/infra/bifrost-cleanup-job.yml
+++ b/jjb/infra/bifrost-cleanup-job.yml
@@ -67,7 +67,7 @@
fi
# No force (-f). We always verify upstream jobs so if there are no logs
# something else went wrong and we need to break immediately and investigate
- gsutil rm -r $BIFROST_GS_URL
+ gsutil -m rm -r $BIFROST_GS_URL
triggers:
- '{project}-gerrit-trigger-cleanup':
@@ -86,13 +86,8 @@
server-name: 'review.openstack.org'
escape-quotes: true
trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - patchset-uploaded-event: 'false'
- # We only run this when the change is merged since
- # we don't need the logs anymore
+ # We only run this when the change is merged or
+ # abandoned since we don't need the logs anymore
- change-merged-event: 'true'
- change-abandoned-event: 'true'
- change-restored-event: 'false'
@@ -119,13 +114,8 @@
- gerrit:
server-name: 'gerrit.opnfv.org'
trigger-on:
- - patchset-created-event:
- exclude-drafts: 'false'
- exclude-trivial-rebase: 'false'
- exclude-no-code-change: 'false'
- - patchset-uploaded-event: 'false'
- # We only run this when the change is merged since
- # we don't need the logs anymore
+ # We only run this when the change is merged or
+ # abandoned since we don't need the logs anymore
- change-merged-event: 'true'
- change-abandoned-event: 'true'
- change-restored-event: 'false'
diff --git a/jjb/models/models.yml b/jjb/models/models.yml
index f419c8821..89d22bcbd 100644
--- a/jjb/models/models.yml
+++ b/jjb/models/models.yml
@@ -64,4 +64,4 @@
set -o nounset
set -o pipefail
- shellcheck -f tty tests/*.sh
+ # shellcheck -f tty tests/*.sh
diff --git a/jjb/multisite/multisite-daily-jobs.yml b/jjb/multisite/multisite-daily-jobs.yml
index 6b022fd75..23c95f627 100644
--- a/jjb/multisite/multisite-daily-jobs.yml
+++ b/jjb/multisite/multisite-daily-jobs.yml
@@ -138,8 +138,8 @@
- name: 'functest-fuel-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
- DEPLOY_SCENARIO='os-nosdn-multisite-noha'
- FUNCTEST_SUITE_NAME='multisite'
+ DEPLOY_SCENARIO=os-nosdn-multisite-noha
+ FUNCTEST_SUITE_NAME=multisite
OS_REGION=RegionOne
REGIONONE_IP=100.64.209.10
REGIONTWO_IP=100.64.209.11
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 01b28204e..2d5ec4fa4 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -78,7 +78,7 @@
- shell: |
sudo pip install virtualenv
virtualenv $WORKSPACE/venv
- source $WORKSPACE/venv/bin/activate
+ . $WORKSPACE/venv/bin/activate
pip install --upgrade pip
pip freeze
pip install tox
diff --git a/jjb/ves/ves.yml b/jjb/ves/ves.yml
index 5f0da3320..3d3ba2ca8 100644
--- a/jjb/ves/ves.yml
+++ b/jjb/ves/ves.yml
@@ -64,5 +64,5 @@
set -o nounset
set -o pipefail
- shellcheck -f tty tests/*.sh
- shellcheck -f tty utils/*.sh
+ # shellcheck -f tty tests/*.sh
+ # shellcheck -f tty utils/*.sh
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 604eaed25..1f2f3122c 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -272,7 +272,7 @@
publishers:
- email:
- recipients: jean.gaoliang@huawei.com matthew.lijun@huawei.com
+ recipients: jean.gaoliang@huawei.com limingjiang@huawei.com
########################
# builder macros