Adapt engine-verify jobs for engine refactoring

[infra/cicd.git] / jjb / engine / verify-jobs / engine-verify-package.yaml

diff --git a/jjb/engine/engine-verify-jobs/engine-verify-package.yaml b/jjb/engine/verify-jobs/engine-verify-package.yaml
similarity index 81%
rename from jjb/engine/engine-verify-jobs/engine-verify-package.yaml
rename to jjb/engine/verify-jobs/engine-verify-package.yaml
index 94fec2cbcbfc1e8ea509752ff319978c6e7d85c6..f8ccece825f8a850f0f598702048d7d7f5c7bf47 100644 (file)
--- a/jjb/engine/engine-verify-jobs/engine-verify-package.yaml
+++ b/jjb/engine/verify-jobs/engine-verify-package.yaml
@@ -27,7 +27,7 @@
           branch: '{stream}'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
           execution-mode: 'packaging'
-          gated-projects: 'infra/engine|infra/provisioner/bifrost|infra/provisioner/heat|infra/installer/kolla|infra/installer/kubespray'
+          gated-projects: 'infra/engine|infra/provisioner/bifrost|infra/provisioner/heat'
           successful: false
           failed: false
           unstable: false
@@ -62,30 +62,6 @@
           name: VERBOSITY
           default: 'true'
           description: 'Verbosity setting for the engine - true or false - default is false'
-      - string:
-          name: ENGINE_REPO_URL
-          default: 'https://gerrit.nordix.org/infra/engine.git'
-          description: 'URL to Nordix Cloud Infra engine repository'
-      - string:
-          name: ARTIFACTS_TO_UPLOAD
-          default: "k8s-installer-ubuntu1804.bsx"
-          description: 'Artifacts to upload'
-      - string:
-          name: NORDIX_ARM_PUBLIC_IP
-          default: '91.106.198.25'
-          description: 'Public IP of Nordix Artifactory. Offline deployments can not resolve domain name'
-      - string:
-          name: NORDIX_ARM_HTTPS_URL
-          default: 'https://artifactory.nordix.org/artifactory'
-          description: 'URL to Nordix Artifactory'
-      - string:
-          name: NORDIX_ARM_REPO
-          default: 'nordix-kubernetes'
-          description: 'Name of the repository to upload and download artifact to/from. Depends on the stack'
-      - string:
-          name: NORDIX_ARTIFACT_URL
-          default: "$NORDIX_ARM_HTTPS_URL/$NORDIX_ARM_REPO/installer/oss/gerrit/$GERRIT_CHANGE_NUMBER"
-          description: 'Artifact to download'
       - string:
           name: CI_LOOP
           default: 'verify'
@@ -118,7 +94,7 @@
     scm:
       - git-scm-gerrit:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: refs/heads/$GERRIT_BRANCH
+          branch: $GERRIT_BRANCH
           refspec: $GERRIT_REFSPEC
           wipe_workspace: true
           clean_before: false
@@ -183,7 +159,9 @@
 
 
     builders:
-      - 'generate-sdf-for-change-macro'
+      - 'generate-change-metadata-macro'
+      - inject:
+          properties-file: "$WORKSPACE/change.properties"
       - 'generate-ssh-keypair-macro'
       - 'wait-pkg-mgr-macro'
       - 'package-macro'