X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fverify-jobs%2Fengine-verify-deploy-test.yaml;h=7433d6e2b5c2088002ebcfb8e4c32f8e04c98c1b;hb=520cc6c1541563e7b8ac5240de9a256f6bf55b07;hp=faf27d461d8460cb96da023b1f50d18edaa5f1b4;hpb=c522a29d70d9b383d21d02c7d7ec7646f05d7ded;p=infra%2Fcicd.git

diff --git a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
index faf27d46..7433d6e2 100644
--- a/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-deploy-test.yaml
@@ -30,8 +30,6 @@
       - online:
           disabled: false
           execution-mode: online-deployment
-          pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
-          idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
           successful: false
           failed: false
           unstable: false
@@ -39,8 +37,6 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-          pdf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-pdf.yml'
-          idf: 'file:///opt/engine/offline/git/hwconfig/pods/nordix-vpod1-idf.yml'
           successful: false
           failed: false
           unstable: false
@@ -55,10 +51,14 @@
           provisioner-type: 'bifrost'
           slave-type: 'vpod'
           gated-projects: 'infra/engine|infra/provisioner/bifrost'
+          pdf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-pdf.yml'
+          idf: 'https://gerrit.nordix.org/gitweb?p=infra/hwconfig.git;a=blob_plain;f=pods/nordix-vpod1-idf.yml'
       - cloud:
           provisioner-type: 'heat'
           slave-type: 'jumphost'
           gated-projects: 'infra/engine|infra/provisioner/heat'
+          pdf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-environment-city-ubuntu1804.yaml"
+          idf: "https://gerrit.nordix.org/gitweb?p=infra/provisioner/heat.git;a=blob_plain;f=playbooks/roles/create-stack/files/heat-idf.yaml"
 
     distro:
       - ubuntu1804
@@ -110,11 +110,11 @@
           description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
-          default: "nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "nordix-cicd-verify-engine-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created stack'
       - string:
           name: KEYPAIR_NAME
-          default: "keypair-nordix-cicd-verify-engine-online-{distro}-$GERRIT_CHANGE_NUMBER"
+          default: "keypair-nordix-cicd-verify-engine-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
           description: 'Name of the created keypair'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
@@ -159,8 +159,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '.*?-verify-online-deploy-test-.*'
-            - '.*?-verify-offline-deploy-test-.*'
+            - 'engine-verify-online-deploy-test-.*'
+            - 'kubernetes-verify-offline-deploy-test-.*'
+            - 'onap-verify-offline-deploy-test-.*'
+            - 'openstack-verify-deploy-test-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1