diff options
| -rw-r--r-- | jjb/apex/apex.yml | 9 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yml | 16 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-artifacts-upload.sh | 5 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 2 | ||||
| -rw-r--r-- | jjb/global/slave-params.yml | 10 | ||||
| -rw-r--r-- | jjb/infra/bifrost-verify-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/releng/testapi-automate.yml | 16 |
7 files changed, 41 insertions, 21 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 70731b568..064b89ceb 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -31,11 +31,16 @@ - 'os-nosdn-nofeature-ha-ipv6' - 'os-nosdn-ovs-noha' - 'os-nosdn-fdio-noha' - - 'os-odl_l3-bgpvpn-ha' - - 'os-odl_l2-fdio-noha' + - 'os-nosdn-fdio-ha' - 'os-odl_l2-fdio-ha' + - 'os-odl_l2-netvirt_gbp_fdio-noha' - 'os-odl_l2-sfc-noha' - 'os-odl_l3-nofeature-ha' + - 'os-odl_l3-bgpvpn-ha' + - 'os-odl_l3-fdio-noha' + - 'os-odl_l3-fdio-ha' + - 'os-odl_l3-fdio_dvr-noha' + - 'os-odl_l3-fdio_dvr-ha' - 'os-onos-nofeature-ha' platform: diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 335eb7133..e225a123f 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -178,7 +178,9 @@ disabled: '{obj:disabled}' parameters: - - 'doctor-default' + - 'doctor-defaults': + project: '{project}' + branch: '{branch}' - string: name: PROFILER default: poc @@ -188,14 +190,16 @@ - git-scm-gerrit triggers: - - 'doctor-experimental' + - 'experimental': + project: '{project}' + branch: '{branch}' ##################################### # parameter macros ##################################### # TODO(yujunz) replace common parameter in doctor-verify-{stream} with macro - parameter: - name: 'doctor-default' + name: 'doctor-defaults' parameters: - project-parameter: project: '{project}' @@ -206,14 +210,15 @@ ##################################### # trigger macros ##################################### +# TODO(yujunz) move to opnfv commom - trigger: - name: 'doctor-experimental' + name: 'experimental' triggers: - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - comment-added-contains-event: - comment-contains-value: 'check experimental' + comment-contains-value: 'check-experimental' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -228,3 +233,4 @@ failed: true unstable: true notbuilt: true + silent-start: true diff --git a/jjb/dovetail/dovetail-artifacts-upload.sh b/jjb/dovetail/dovetail-artifacts-upload.sh index ce02dd569..b23decad1 100755 --- a/jjb/dovetail/dovetail-artifacts-upload.sh +++ b/jjb/dovetail/dovetail-artifacts-upload.sh @@ -16,6 +16,7 @@ echo "dovetail: pull and save the images" cd ${CACHE_DIR} sudo docker pull ${DOCKER_REPO_NAME}:${DOCKER_TAG} sudo docker save -o ${STORE_FILE_NAME} ${DOCKER_REPO_NAME}:${DOCKER_TAG} +sudo chmod og+rw ${STORE_FILE_NAME} OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") GS_UPLOAD_LOCATION="${STORE_URL}/${OPNFV_ARTIFACT_VERSION}" @@ -88,6 +89,6 @@ echo "--------------------------------------------------------" echo } -importkey -sign +#importkey +#sign upload diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 4082c34fe..4cc03f7c9 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -57,7 +57,7 @@ if [ -z ${container_id} ]; then docker ps -a exit 1 fi -echo "COntainer Start: docker start ${container_id}" +echo "Container Start: docker start ${container_id}" docker start ${container_id} sleep 5 docker ps >${redirect} diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml index 30ebb950f..39a1b1b9c 100644 --- a/jjb/global/slave-params.yml +++ b/jjb/global/slave-params.yml @@ -703,6 +703,16 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'odl-netvirt-virtual-intel-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'odl-netvirt-virtual-intel' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' ##################################################### # These slaves are just dummy slaves for sandbox jobs ##################################################### diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml index baf33ea3a..422a42274 100644 --- a/jjb/infra/bifrost-verify-jobs.yml +++ b/jjb/infra/bifrost-verify-jobs.yml @@ -132,6 +132,10 @@ timeout: 10 wipe-workspace: true + triggers: + - '{project}-gerrit-trigger': + branch: '{branch}' + builders: - description-setter: description: "Built on $NODE_NAME" diff --git a/jjb/releng/testapi-automate.yml b/jjb/releng/testapi-automate.yml index d96c5cdc3..2a2f7b6d4 100644 --- a/jjb/releng/testapi-automate.yml +++ b/jjb/releng/testapi-automate.yml @@ -25,15 +25,9 @@ - gerrit: server-name: 'gerrit.opnfv.org' trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event + - change-merged-event - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' + comment-contains-value: 'remerge' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -64,16 +58,16 @@ name: start-testapi-server builders: - shell: | - bash ../../utils/test/testapi/htmlize/prepare.sh + bash ./utils/test/testapi/htmlize/prepare.sh - builder: name: clean-testapi-server builders: - shell: | - bash ../../utils/test/testapi/htmlize/finish.sh + bash ./utils/test/testapi/htmlize/finish.sh - builder: name: upload-doc-artifact builders: - shell: | - bash ../../utils/test/testapi/htmlize/push-doc-artifact.sh + bash ./utils/test/testapi/htmlize/push-doc-artifact.sh |