X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fironic-jobs%2Fironic-verify-provision.yaml;fp=jjb%2Fengine%2Fironic-jobs%2Fironic-verify-deploy-test.yaml;h=827fb09b2916e3bfcaf3869c368fb84987c90725;hb=717b9af093b9e922d364a9815068b144b35f03e9;hp=5a1051362d970362f76e7eb8d837c73c0ca81f79;hpb=24eaec5b71aa5f80e147731d7204c86f0dbd4a2b;p=infra%2Fcicd.git

diff --git a/jjb/engine/ironic-jobs/ironic-verify-deploy-test.yaml b/jjb/engine/ironic-jobs/ironic-verify-provision.yaml
similarity index 84%
rename from jjb/engine/ironic-jobs/ironic-verify-deploy-test.yaml
rename to jjb/engine/ironic-jobs/ironic-verify-provision.yaml
index 5a1051362..827fb09b2 100644
--- a/jjb/engine/ironic-jobs/ironic-verify-deploy-test.yaml
+++ b/jjb/engine/ironic-jobs/ironic-verify-provision.yaml
@@ -18,9 +18,9 @@
 # ============LICENSE_END=========================================================
 
 - project:
-    name: 'ironic-verify-deploy-test'
+    name: 'ironic-verify-provision'
 
-    project: 'ironic-verify-deploy-test'
+    project: 'ironic-verify-provision'
 
     stream:
       - 'master':
@@ -65,13 +65,10 @@
     dependency-job-var: 'TRIGGER_ironic_verify_package_{distro}_{stream}_BUILD_RESULT'
 
     jobs:
-      - 'ironic-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
-      - 'ironic-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}'
+      - 'ironic-verify-{environment-type}-provision-{distro}-{cloud}-{type}-{stream}'
 
 - job-template:
-    name: 'ironic-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
-
-    project-type: multijob
+    name: 'ironic-verify-{environment-type}-provision-{distro}-{cloud}-{type}-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -208,6 +205,7 @@
           dependency-jobs: '{dependency-jobs}'
 
     wrappers:
+      - fix-workspace-permissions
       - build-timeout:
           timeout: 180
       - credentials-binding:
@@ -252,18 +250,12 @@
 
     builders:
       - 'generate-change-metadata-macro'
-      - multijob:
-          name: "{environment-type} deployment on {type} instances"
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'ironic-verify-{environment-type}-deploy-{distro}-city-{type}-{stream}'
-              current-parameters: true
-              git-revision: true
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: false
-              property-file: $WORKSPACE/change.properties
+      - inject:
+          properties-file: "$WORKSPACE/change.properties"
+      - 'generate-ssh-keypair-macro'
+      - 'download-artifact-macro'
+      - 'wait-pkg-mgr-macro'
+      - 'deploy-macro'
 
     publishers:
       - postbuildscript:
@@ -278,45 +270,3 @@
               build-steps:
                 - 'wait-pkg-mgr-macro'
                 - 'delete-stack-macro'
-
-- job-template:
-    name: 'ironic-verify-{environment-type}-{phase}-{distro}-{cloud}-{type}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate
-      - throttle:
-          max-per-node: 1
-          max-total: 3
-          option: project
-
-    scm:
-      - git-scm-gerrit:
-          ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: $GERRIT_BRANCH
-          refspec: $GERRIT_REFSPEC
-          wipe_workspace: true
-          clean_before: false
-
-    wrappers:
-      - build-timeout:
-          timeout: 180
-      - credentials-binding:
-          - file:
-              credential-id: '{openrc-credentials-file}'
-              variable: OPENRC_FILE
-          - username-password-separated:
-              credential-id: 'nordix-cicd-arm-credentials'
-              username: NORDIX_ARM_USERNAME
-              password: NORDIX_ARM_TOKEN
-      - mask-passwords
-      - fix-workspace-permissions
-
-    builders:
-      - 'generate-ssh-keypair-macro'
-      - 'wait-pkg-mgr-macro'
-      - 'download-artifact-macro'
-      - '{phase}-macro'