Merge "Add Airship v1beta1 jobs"

diff --combined jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
index 9189cbe08b2ac260f8721625e23703522932cc67,bf404b0193d05996b4bb74708c52eb4ea159af69..7cc3fc0b4f5903662b182488c839abefa46ba79b
--- 1/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
--- 2/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
@@@ -60,11 -60,11 +60,11 @@@
      - string:
          name: CAPI_VERSION
          default: 'v1alpha4'
-         description: 'Cluster API version. Can be v1alpha4.'
+         description: 'Cluster API version.'
      - string:
          name: CAPM3_VERSION
          default: 'v1alpha5'
-         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+         description: 'Cluster API provider Metal3 version.'
      - string:
          name: TARGET_NODE_OS
          default: 'Centos'
@@@ -73,7 -73,7 +73,7 @@@
          name: TARGET_NODE_MEMORY
          default: 4096
          description: 'RAM size of the target host.'
-         
+ 
      properties:
      - build-discarder:
          days-to-keep: 30
@@@ -82,7 -82,7 +82,7 @@@
          artifact-num-to-keep: -1
  
      triggers:
 -      - timed: "H 4 * * *"
 +      - timed: "30 4 * * *"
  
      pipeline-scm:
        scm:

diff --combined jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
index 3f96a17a8e7c2300af6a1bf7cfa7ab54ae9198e9,725555098d5bae37146bf1b81916e13cf9029bb8..3c6efafbcd92bc38f5612b4fe3cd3103796299c7
--- 1/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
--- 2/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
@@@ -60,11 -60,11 +60,11 @@@
      - string:
          name: CAPI_VERSION
          default: 'v1alpha4'
-         description: 'Cluster API version. Can be v1alpha4.'
+         description: 'Cluster API version.'
      - string:
          name: CAPM3_VERSION
          default: 'v1alpha5'
-         description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+         description: 'Cluster API provider Metal3 version.'
      - string:
          name: TARGET_NODE_OS
          default: 'Ubuntu'
@@@ -82,7 -82,7 +82,7 @@@
          artifact-num-to-keep: -1
  
      triggers:
 -      - timed: "H 4 * * *"
 +      - timed: "45 4 * * *"
  
      pipeline-scm:
        scm:

diff --combined jjb/airship/job_feature_tests_centos.yml
index 88a3af3d418ee8c6893e64f9cffba709192ece86,e880a630914190534503d6f7232dccd9e05514eb..dc59e7bf39f2f563ca978525300adde1299063df
--- 1/jjb/airship/job_feature_tests_centos.yml
--- 2/jjb/airship/job_feature_tests_centos.yml
+++ b/jjb/airship/job_feature_tests_centos.yml
@@@ -81,10 -81,6 +81,10 @@@
          name: TESTS_FOR
          default: "feature_tests_centos"
          description: 'Tests for pivoting and remediation.'
 +    - string:
 +        name: PROMETHEUS_MONITORING
 +        default: "true"
 +        description: 'Enable Prometheus metrics'
  
      properties:
      - build-discarder:
@@@ -112,7 -108,8 +112,8 @@@
          white-list-target-branches:
            - 'master'
            - 'main'
-           - 'release-0.4'
+           - 'release-0.5'
+           - 'release-0.1'
          status-context: "test-features-centos"
          success-status: "Passed"
          failure-status: "Failed"

diff --combined jjb/airship/job_feature_tests_ubuntu.yml
index c3037227baa44d853d9d6bc4f020413c6c7c93a2,980dd6ff73989a2ec7202147ab2478372be06de0..da8b7376882ae8a66cb2efe61d9e97b94ac41b59
--- 1/jjb/airship/job_feature_tests_ubuntu.yml
--- 2/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_ubuntu.yml
@@@ -81,10 -81,6 +81,10 @@@
          name: TESTS_FOR
          default: "feature_tests"
          description: 'Tests for pivoting and remediation.'
 +    - string:
 +        name: PROMETHEUS_MONITORING
 +        default: "true"
 +        description: 'Enable Prometheus metrics'
  
      properties:
      - build-discarder:
@@@ -112,7 -108,8 +112,8 @@@
          white-list-target-branches:
            - 'master'
            - 'main'
-           - 'release-0.4'
+           - 'release-0.5'
+           - 'release-0.1'
          status-context: "test-features"
          success-status: "Passed"
          failure-status: "Failed"

diff --combined jjb/airship/job_feature_tests_upgrade_ubuntu.yml
index b64d50b35aca34289176a3c8c2c529da442db5eb,d623ac20a1ff3f3fffa8afd79035d1ea44084c7b..2f26569fdd5ee573e4c3b875e73aa9477c3a2f5a
--- 1/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
--- 2/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
@@@ -81,10 -81,6 +81,10 @@@
          name: TESTS_FOR
          default: "feature_tests_upgrade"
          description: 'Tests for upgrade.'
 +    - string:
 +        name: PROMETHEUS_MONITORING
 +        default: "true"
 +        description: 'Enable Prometheus metrics'
  
      properties:
      - build-discarder:
@@@ -112,7 -108,8 +112,8 @@@
          white-list-target-branches:
            - 'master'
            - 'main'
-           - 'release-0.4'
+           - 'release-0.5'
+           - 'release-0.1'
          status-context: "test-upgrade-features"
          success-status: "Passed"
          failure-status: "Failed"

diff --combined jjb/airship/projects.yml
index c16cf95e36865a44a76941faabd89faf85b778b5,4d3e04c90a50f49061b943655d59e34f1e707a93..f63765f3f69dfd6c947a86ce9668ec4dfe966f4b
--- 1/jjb/airship/projects.yml
--- 2/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@@ -64,10 -64,13 +64,12 @@@
      - capi_bm_v1a4_integration_tests_ubuntu
      - capi_bm_v1a5_integration_tests_centos
      - capi_bm_v1a5_integration_tests_ubuntu
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu
      - feature_tests_ubuntu
      - feature_tests_centos
      - feature_tests_upgrade_ubuntu
 -    - bml_integration_test_centos
 -    - bml_integration_test_ubuntu
 +    - bml_integration_tests_centos
  
  - project:
      name: 'metal3io_project_infra_cleanup'
@@@ -90,6 -93,8 +92,8 @@@
      - capi_bm_v1a4_integration_tests_ubuntu
      - capi_bm_v1a5_integration_tests_centos
      - capi_bm_v1a5_integration_tests_ubuntu
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu
      - feature_tests_ubuntu
  
  - project:
@@@ -102,6 -107,8 +106,8 @@@
      - capi_bm_v1a4_integration_tests_ubuntu
      - capi_bm_v1a5_integration_tests_centos
      - capi_bm_v1a5_integration_tests_ubuntu
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu
  
  - project:
      name: "metal3io_metal3_dev_env"
@@@ -114,14 -121,18 +120,18 @@@
      - capi_bm_v1a5_integration_tests_ubuntu
      - capi_bm_v1a5_master_integration_tests_centos
      - capi_bm_v1a5_master_integration_tests_ubuntu
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu
+     - capm3_v1b1_master_integration_tests_centos
+     - capm3_v1b1_master_integration_tests_ubuntu
      - feature_tests_ubuntu
      - feature_tests_centos
      - feature_tests_upgrade_ubuntu
      - master_feature_tests_ubuntu
      - master_feature_tests_centos
      - master_feature_tests_upgrade_ubuntu
 -    - bml_integration_test_centos
 -    - bml_integration_test_ubuntu
 +    - bml_integration_tests_centos
 +    - bml_master_integration_tests_centos
  
      repo:
        org: "metal3-io"
@@@ -141,6 -152,8 +151,8 @@@
      - capi_capm3_v1a5_e2e_tests_centos
      - capi_capm3_v1a5_master_e2e_tests_ubuntu
      - capi_capm3_v1a5_master_e2e_tests_centos
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu
  
  
  - project:
@@@ -153,6 -166,8 +165,8 @@@
      - capi_bm_v1a4_integration_tests_ubuntu
      - capi_bm_v1a5_integration_tests_centos
      - capi_bm_v1a5_integration_tests_ubuntu
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu
  
  - project:
      name: "metal3io_ironic_ipa_downloader"
@@@ -162,3 -177,5 +176,5 @@@
      jobs:
      - capi_bm_v1a4_integration_tests_ubuntu
      - capi_bm_v1a5_integration_tests_ubuntu
+     - capm3_v1b1_integration_tests_centos
+     - capm3_v1b1_integration_tests_ubuntu