engine: Fine tune release jobs

[infra/cicd.git] / jjb / engine / periodic-jobs / engine-periodic-offline-deploy-test.yaml

diff --git a/jjb/engine/engine-periodic-jobs/engine-periodic-offline-deploy-test.yaml b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
similarity index 80%
rename from jjb/engine/engine-periodic-jobs/engine-periodic-offline-deploy-test.yaml
rename to jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
index 43f6e65f7336202d051addd026d1497acf524de2..e3e68c1f88b8faa2292ec37104f6b1660a1dbc20 100644 (file)
--- a/jjb/engine/engine-periodic-jobs/engine-periodic-offline-deploy-test.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
@@ -33,6 +33,7 @@
       - k8-calico-nofeature
       - k8-multus-nofeature
 
+
     type:
       - baremetal:
           pod-name: est-baremetal
@@ -41,6 +42,13 @@
           slave-label: baremetal-deploy
           yardstick-dispatcher: 'influxdb'
 
+    environment-type:
+      - offline:
+          disabled: false
+          execution-mode: offline-deployment
+          pdf: 'file:///opt/engine/offline/git/hwconfig/pods'
+          idf: 'file:///opt/engine/offline/git/hwconfig/pods'
+
     phase:
       - deploy:
           build-timeout: 90
@@ -50,11 +58,11 @@
           build-timeout: 120
 
     jobs:
-      - '{deploy-scenario}-offline-{distro}-{type}-periodic'
-      - 'kubernetes-offline-{phase}-{distro}-{type}-periodic'
+      - '{deploy-scenario}-{environment-type}-{distro}-{type}-periodic'
+      - 'kubernetes-{environment-type}-{phase}-{distro}-{type}-periodic'
 
 - job-template:
-    name: '{deploy-scenario}-offline-{distro}-{type}-periodic'
+    name: '{deploy-scenario}-{environment-type}-{distro}-{type}-periodic'
 
     project-type: multijob
 
@@ -79,6 +87,14 @@
           name: DEPLOY_SCENARIO
           default: '{deploy-scenario}'
           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: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
@@ -117,7 +133,7 @@
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'kubernetes-offline-deploy-{distro}-{type}-periodic'
+            - name: 'kubernetes-{environment-type}-deploy-{distro}-{type}-periodic'
               current-parameters: true
               node-parameters: true
               kill-phase-on: FAILURE
@@ -126,7 +142,7 @@
           name: functest
           condition: ALWAYS
           projects:
-            - name: 'kubernetes-offline-functest-{distro}-{type}-periodic'
+            - name: 'kubernetes-{environment-type}-functest-{distro}-{type}-periodic'
               current-parameters: true
               node-parameters: true
               kill-phase-on: FAILURE
@@ -135,14 +151,14 @@
           name: yardstick
           condition: ALWAYS
           projects:
-            - name: 'kubernetes-offline-yardstick-{distro}-{type}-periodic'
+            - name: 'kubernetes-{environment-type}-yardstick-{distro}-{type}-periodic'
               current-parameters: true
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
 
 - job-template:
-    name: 'kubernetes-offline-{phase}-{distro}-{type}-periodic'
+    name: 'kubernetes-{environment-type}-{phase}-{distro}-{type}-periodic'
 
     disabled: '{obj:disabled}'