X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fperiodic-jobs%2Fengine-periodic-release-jobs.yaml;h=f4c3bfef8428f8ce5b880b52bd2b282e7cca8503;hb=299841ac0e55baa3f49aab1e0e55d353fe1d75ca;hp=65eaa57c2d8db1d0707a6ebefa15cfb82a8ac2e0;hpb=8d3e682d48c4444d324e2a87d1e9939becc39e27;p=infra%2Fcicd.git

diff --git a/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml b/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
index 65eaa57c..f4c3bfef 100644
--- a/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-release-jobs.yaml
@@ -40,7 +40,8 @@
 
     jobs:
       - 'kubernetes-periodic-release-{environment-type}-{distro}'
-      - 'kubernetes-periodic-{phase}-{distro}'
+      - 'kubernetes-periodic-package-{distro}'
+      - 'kubernetes-periodic-promote-{distro}'
 
 - job-template:
     name: 'kubernetes-periodic-release-{environment-type}-{distro}'
@@ -105,8 +106,8 @@
       - logrotate
 
     wrappers:
-      - build-timeout:
-          timeout: 180
+#      - build-timeout:
+#          timeout: 180
       - mask-passwords
       - fix-workspace-permissions
 
@@ -123,9 +124,9 @@
           wipe-workspace: true
 
     builders:
-      - 'wait-pkg-mgr-macro'
       - 'generate-ssh-keypair-macro'
-      - 'generate-job-metadata-macro'
+      - 'generate-build-metadata-macro'
+      - 'wait-pkg-mgr-macro'
       - multijob:
           name: package
           condition: SUCCESSFUL
@@ -149,6 +150,7 @@
               node-parameters: false
               property-file: "$WORKSPACE/build.properties"
               predefined-parameters: |
+                EXECUTION_MODE=$EXECUTION_MODE
                 NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
                 ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
                 VERBOSITY=$VERBOSITY
@@ -165,6 +167,7 @@
               node-parameters: false
               property-file: "$WORKSPACE/build.properties"
               predefined-parameters: |
+                EXECUTION_MODE=$EXECUTION_MODE
                 NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
                 ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
                 VERBOSITY=$VERBOSITY
@@ -184,7 +187,40 @@
               abort-all-job: true
 
 - job-template:
-    name: 'kubernetes-periodic-{phase}-{distro}'
+    name: 'kubernetes-periodic-package-{distro}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    properties:
+      - logrotate
+
+    wrappers:
+#      - build-timeout:
+#          timeout: 70
+      - credentials-binding:
+          - username-password-separated:
+              credential-id: 'nordix-cicd-arm-credentials'
+              username: NORDIX_ARM_USERNAME
+              password: NORDIX_ARM_TOKEN
+      - mask-passwords
+      - fix-workspace-permissions
+
+    scm:
+      - git:
+          url: https://gerrit.nordix.org/infra/engine.git
+          branches:
+            - master
+          timeout: 15
+          wipe-workspace: true
+
+    builders:
+      - 'package-macro'
+      - 'upload-artifact-macro'
+
+- job-template:
+    name: 'kubernetes-periodic-promote-{distro}'
 
     disabled: '{obj:disabled}'
 
@@ -194,8 +230,8 @@
       - logrotate
 
     wrappers:
-      - build-timeout:
-          timeout: 70
+#      - build-timeout:
+#          timeout: 70
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
@@ -213,11 +249,4 @@
           wipe-workspace: true
 
     builders:
-      - shell: |
-          #!/bin/bash
-          env
-
-#      - 'wait-pkg-mgr-macro'
-#      - 'generate-ssh-keypair-macro'
-#      - 'package-macro'
-#      - 'upload-artifact-macro'
+      - 'promote-macro'