diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 8 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 4 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 2 | ||||
| -rw-r--r-- | jjb/qtip/qtip-ci-jobs.yml | 12 |
4 files changed, 16 insertions, 10 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index 8b0af31e3..901f845bf 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -30,8 +30,7 @@ else fi # set deployment parameters -export TMPDIR=$HOME/tmpdir -BRIDGE=${DEFAULT_BRIDGE:-pxebr} +export TMPDIR=${WORKSPACE}/tmpdir LAB_NAME=${NODE_NAME/-*} POD_NAME=${NODE_NAME/*-} @@ -47,7 +46,8 @@ echo "Using configuration for $LAB_NAME" mkdir -p $TMPDIR cd $WORKSPACE -if [[ $LAB_CONFIG_URL =~ ^git:// ]]; then +if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then + echo "cloning $LAB_CONFIG_URL" git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config LAB_CONFIG_URL=file://${WORKSPACE}/lab-config fi @@ -56,7 +56,7 @@ fi ISO_FILE=$WORKSPACE/opnfv.iso # construct the command -DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -l $LAB_NAME -p $POD_NAME -b ${LAB_CONFIG_URL} -s $DEPLOY_SCENARIO -i file://${ISO_FILE} -H -B $BRIDGE -S $TMPDIR" +DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -l $LAB_NAME -p $POD_NAME -b ${LAB_CONFIG_URL} -s $DEPLOY_SCENARIO -i file://${ISO_FILE} -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR" # log info to console echo "Deployment parameters" diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index c861b92fe..b13b51fec 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -91,6 +91,7 @@ use-build-blocker: true blocking-jobs: - 'joid-os-.*?-{pod}-daily-{stream}' + block-level: 'NODE' wrappers: - build-name: @@ -143,7 +144,7 @@ - job-template: name: 'joid-deploy-{pod}-daily-{stream}' - concurrent: false + concurrent: true properties: - throttle: @@ -154,6 +155,7 @@ use-build-blocker: true blocking-jobs: - 'joid-deploy-{pod}-daily-{stream}' + block-level: 'NODE' wrappers: - build-name: diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 3dc9be132..ee749141f 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -681,5 +681,5 @@ description: 'Deployment timeout in minutes' - string: name: LAB_CONFIG_URL - default: file://$HOME/opnfv/repos/lab-config + default: ssh://git@git.enea.com/pharos/lab-config description: 'Base URI to the configuration directory' diff --git a/jjb/qtip/qtip-ci-jobs.yml b/jjb/qtip/qtip-ci-jobs.yml index ee321eb5b..6e9a20de5 100644 --- a/jjb/qtip/qtip-ci-jobs.yml +++ b/jjb/qtip/qtip-ci-jobs.yml @@ -38,9 +38,10 @@ installer: joid <<: *master auto-trigger-name: 'daily-trigger-disabled' -# - zte-pod1: #would be confirmed with the ZTE lab by tomorrow -# installer: fuel -# <<: *master + - zte-pod1: + installer: fuel + auto-trigger-name: 'qtip-daily-zte-pod1-trigger' + <<: *master #-------------------------------- jobs: @@ -180,4 +181,7 @@ # triggers: # - timed : ' 0 0 * * *' - +- trigger: + name: 'qtip-daily-zte-pod1-trigger' + triggers: + - timed: '0 5 * * *' |