diff options
| -rw-r--r-- | jjb/apex/apex.yml | 22 | ||||
| -rw-r--r-- | jjb/apex/scenarios.yaml.hidden | 2 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy-deploy.sh | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 26eddb5b2..3f6d4c0cd 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -132,6 +132,10 @@ <<: *master - 'os-odl-sfc-ha': <<: *master + - 'os-odl-fdio-dvr-noha': + <<: *master + - 'os-odl-fdio-dvr-ha': + <<: *master platform: - 'baremetal' @@ -1332,6 +1336,24 @@ abort-all-job: true git-revision: false + - name: 'apex-os-odl-fdio-dvr-noha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + + - name: 'apex-os-odl-fdio-dvr-ha-baremetal-master' + node-parameters: false + current-parameters: false + predefined-parameters: | + OPNFV_CLEAN=yes + kill-phase-on: NEVER + abort-all-job: true + git-revision: false + # snapshot create diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden index f49fa83c7..def4e796a 100644 --- a/jjb/apex/scenarios.yaml.hidden +++ b/jjb/apex/scenarios.yaml.hidden @@ -18,6 +18,8 @@ master: - 'os-nosdn-kvm_ovs_dpdk-ha' - 'os-odl-sfc-noha' - 'os-odl-sfc-ha' + - 'os-odl-fdio-dvr-noha' + - 'os-odl-fdio-dvr-ha' danube: - 'os-nosdn-nofeature-noha' - 'os-nosdn-nofeature-ha' diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index 785f3a571..0bcac4b02 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -28,7 +28,7 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \ # daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir cp -r securedlab/labs . -DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \ +DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -b $BASE_DIR \ -l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO" # log info to console |