INFRA: Switch to tox for JJB verify and merge jobs

[infra/cicd.git] / jjb / cloud-infra / ironic-jobs / ironic-verify-provision.yaml

diff --git a/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml b/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml
index 827fb09b2916e3bfcaf3869c368fb84987c90725..91d5efff40e17d12130417b3ad01013ef3ff00d6 100644 (file)
--- a/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml
+++ b/jjb/cloud-infra/ironic-jobs/ironic-verify-provision.yaml
@@ -56,6 +56,7 @@
 
     distro:
       - ubuntu1804
+      - centos7
 
     cloud:
       - city:
@@ -85,8 +86,12 @@
           description: 'Distribution to use for configuring target nodes (networking etc.)'
       - label:
           name: SLAVE_LABEL
-          default: 'engine-{slave-type}-{environment-type}-{distro}-fra'
+          default: 'engine-{slave-type}-{environment-type}-ubuntu1804-fra'
           description: 'Slave label to schedule this job on.'
+      - string:
+          name: STACK_TYPE
+          default: 'ironic'
+          description: 'Stack type to verify change with'
       - string:
           name: HW_TYPE
           default: '{type}'
@@ -103,10 +108,6 @@
           name: IDF
           default: '{idf}'
           description: 'IDF file to use for deployment'
-      - string:
-          name: HEAT_ENVIRONMENT_FILENAME
-          default: 'heat-environment-{cloud}-{distro}.yaml'
-          description: 'Name of heat-environment file to use.'
       - string:
           name: HEAT_STACK_NAME
           default: "nordix-cicd-verify-ironic-{environment-type}-{distro}-$GERRIT_CHANGE_NUMBER"
@@ -253,7 +254,7 @@
       - inject:
           properties-file: "$WORKSPACE/change.properties"
       - 'generate-ssh-keypair-macro'
-      - 'download-artifact-macro'
+      - 'download-deploy-artifact-macro'
       - 'wait-pkg-mgr-macro'
       - 'deploy-macro'