Merge "Modify timing for automated ipa-ironic builds"

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
index 238b91e3f57c17a869a23a0ea5fdffe926ad6545..4fe1c682d65cd2213bb9bfe4d4a3c613481041bc 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.21.2"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
index 671345d006a354133128e7b3f34ddf751b0eaf80..e878814c53fd1947a0ab2d943bf8010b0c5b96c5 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.21.2"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
index 16903f5a387c2eac39d4ecd5b5db02cc8f7390cc..0ba9bb44d5dd141a3baa11fb678cd50152783ec7 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.21.2"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +86,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "H 4 * * *"
 
     pipeline-scm:
       scm:

diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
index 9bd4b4d6d1e3e9361e6019b8a6ef4a9adb852ff6..1dabb07d9bda5d68550ddf754f276f9a4728ac9c 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.21.2"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +86,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "H 4 * * *"
 
     pipeline-scm:
       scm:

diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
index 3929242febb282f3ebfb40c6aa478915b3cbbe1b..0e0d7802c42fff8092bbf8ae3a3b74253fff6b36 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
index 90290a216972387465cde6b55e1eac1689411ba9..8cc6b960c6c7dcc83502e7bb906c19fb19b1d86f 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
index 8daae8b9dd4667d45f8229e2e086b64d0dc6c751..1e6e2d19192cc624e55b02979c285e010c9d5918 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +86,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "H 4 * * *"
 
     pipeline-scm:
       scm:

diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
index 97b99473788efd76fb3020b3e707ff546be1dd2e..3e3b0f16d918fbf133bcf9cc95760229a820b43c 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
@@ -73,7 +73,11 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+         
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +86,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "H 4 * * *"
 
     pipeline-scm:
       scm:

diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
index 7afd3a2943a096b130bfde183995d68788f51d8a..c7ba0e8232675626b97755f08600fd5ccf7b600c 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
@@ -77,7 +77,11 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
index 4306994c8c0bcacb0d5246d9eaff084de7ac1386..32a242d0184a1a13a7ac2f9663e2ed7b2d7875c0 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
@@ -77,7 +77,11 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/airship/job_openstack_image_building.yml
index 6261f518e714d87f347c7ba08094e2ef434f5605..6e7b0415a21459a6c3bd5d014dcf92d3013fd12e 100644 (file)
--- a/jjb/airship/job_openstack_image_building.yml
+++ b/jjb/airship/job_openstack_image_building.yml
@@ -32,7 +32,12 @@
     defaults: global
     disabled: False
     concurrent: True
-
+    parameters:
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+        
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/airship/job_openstack_node_image_building.yml b/jjb/airship/job_openstack_node_image_building.yml
index 42f1a7d9c3fbf47548790aa53d5068b84d840618..8e257ee83acabe8c38ea16f627b7f7db75a491ec 100644 (file)
--- a/jjb/airship/job_openstack_node_image_building.yml
+++ b/jjb/airship/job_openstack_node_image_building.yml
@@ -32,7 +32,12 @@
     defaults: global
     disabled: False
     concurrent: True
-
+    parameters:
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+  
     properties:
     - build-discarder:
         days-to-keep: 30

diff --git a/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml b/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml
index c294376673b97933e9e258071700e8e8522cae41..f58c35c066f7e22a63beb6a092a84617feccbe89 100644 (file)
--- a/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml
+++ b/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml
@@ -157,7 +157,9 @@
             - shell: |
                 #!/bin/bash
                 sudo chown -R $USER:$USER $WORKSPACE || exit 1
-
+      - ssh-agent-credentials:
+          users:
+            - 'city-nordix-jenkins-ssh'
 
     builders:
       - 'generate-change-metadata-macro'