engine: Fine tune release jobs

[infra/cicd.git] / jjb / engine / periodic-jobs / engine-periodic-release-jobs.yaml

diff --git a/jjb/engine/engine-periodic-jobs/engine-periodic-release-jobs.yaml b/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
similarity index 81%
rename from jjb/engine/engine-periodic-jobs/engine-periodic-release-jobs.yaml
rename to jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
index eb5d875e41b9caa6da4edf98158c13986f5a1fbf..65eaa57c2d8db1d0707a6ebefa15cfb82a8ac2e0 100644 (file)
--- a/jjb/engine/engine-periodic-jobs/engine-periodic-release-jobs.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
@@ -26,8 +26,6 @@
       - offline:
           disabled: false
           execution-mode: offline-deployment
-          pdf: 'file:///opt/engine/offline/git/hwconfig/pods'
-          idf: 'file:///opt/engine/offline/git/hwconfig/pods'
 
     distro:
       - ubuntu1804
@@ -70,18 +68,18 @@
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
           description: 'Scenario to deploy and test'
-      - string:
-          name: PDF
-          default: '{pdf}/${{NODE_NAME}}-pdf.yml'
-          description: 'PDF file to use for deployment'
-      - string:
-          name: IDF
-          default: '{idf}/${{NODE_NAME}}-idf.yml'
-          description: 'IDF file to use for deployment'
       - string:
           name: VERBOSITY
           default: 'true'
           description: 'Verbosity setting for the engine - true or false - default is false'
+      - string:
+          name: ARTIFACTS_TO_UPLOAD
+          default: "k8s-installer-ubuntu1804.bsx offline-package.tgz"
+          description: 'Artifacts to upload'
+      - string:
+          name: ARTIFACT_TO_DOWNLOAD
+          default: "k8s-installer-ubuntu1804.bsx"
+          description: 'Artifact to download'
       - string:
           name: NORDIX_ARM_PUBLIC_IP
           default: '91.106.198.25'
@@ -95,9 +93,9 @@
           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/change/$GERRIT_CHANGE_NUMBER/k8s-installer-ubuntu1804.bsx"
-          description: 'Name of the repository to upload and download artifact to/from. Depends on the stack'
+          name: CI_LOOP
+          default: 'periodic'
+          description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
           default: 'engine-build-ubuntu1804'
@@ -125,11 +123,11 @@
           wipe-workspace: true
 
     builders:
-      - 'engine-wait-pkg-mgr-macro'
-      - 'engine-generate-ssh-keypair-macro'
-      - 'engine-generate-job-metadata-macro'
+      - 'wait-pkg-mgr-macro'
+      - 'generate-ssh-keypair-macro'
+      - 'generate-job-metadata-macro'
       - multijob:
-          name: packaging
+          name: package
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
@@ -137,7 +135,7 @@
               current-parameters: true
               git-revision: true
               node-parameters: true
-              property-file: "$WORKSPACE/job.properties"
+              property-file: "$WORKSPACE/build.properties"
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
@@ -149,7 +147,11 @@
               current-parameters: false
               git-revision: false
               node-parameters: false
-              property-file: "$WORKSPACE/job.properties"
+              property-file: "$WORKSPACE/build.properties"
+              predefined-parameters: |
+                NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
+                ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
+                VERBOSITY=$VERBOSITY
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
@@ -161,7 +163,11 @@
               current-parameters: false
               git-revision: false
               node-parameters: false
-              property-file: "$WORKSPACE/job.properties"
+              property-file: "$WORKSPACE/build.properties"
+              predefined-parameters: |
+                NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
+                ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
+                VERBOSITY=$VERBOSITY
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
@@ -169,11 +175,11 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'kubernetes-periodic-promote-package-{distro}'
+            - name: 'kubernetes-periodic-promote-{distro}'
               current-parameters: true
               git-revision: true
               node-parameters: true
-              property-file: "$WORKSPACE/job.properties"
+              property-file: "$WORKSPACE/build.properties"
               kill-phase-on: FAILURE
               abort-all-job: true
 
@@ -211,7 +217,7 @@
           #!/bin/bash
           env
 
-#      - 'engine-wait-pkg-mgr-macro'
-#      - 'engine-generate-ssh-keypair-macro'
-#      - 'engine-packaging-macro'
-#      - 'engine-upload-artifact-macro'
+#      - 'wait-pkg-mgr-macro'
+#      - 'generate-ssh-keypair-macro'
+#      - 'package-macro'
+#      - 'upload-artifact-macro'