Merge "Add dev-env-integration test to prow"
authorKashif Khan <kashif.khan@est.tech>
Wed, 17 Apr 2024 10:02:53 +0000 (10:02 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Wed, 17 Apr 2024 10:02:53 +0000 (10:02 +0000)
24 files changed:
jjb/metal3/job_bml_periodic_integration_tests.yml [moved from jjb/metal3/job_bml_main_integration_tests.yml with 97% similarity]
jjb/metal3/job_capm3_e2e_basic_tests.yml
jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml [deleted file]
jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml [moved from jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml with 94% similarity]
jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml [moved from jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml with 83% similarity]
jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml [moved from jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml with 97% similarity]
jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml [moved from jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml with 95% similarity]
jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml [moved from jjb/metal3/job_capm3_main_e2e_integration_tests.yml with 96% similarity]
jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml [moved from jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml with 96% similarity]
jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml [moved from jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml with 95% similarity]
jjb/metal3/job_capm3_periodic_integration_tests.yml [moved from jjb/metal3/job_capm3_main_integration_tests.yml with 96% similarity]
jjb/metal3/job_dev_env_integration_tests.yml
jjb/metal3/job_ironic_image_build_test.yml
jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml
jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
jjb/metal3/job_periodic_clean.yml [moved from jjb/metal3/job_main_clean.yml with 74% similarity]
jjb/metal3/job_periodic_fullstack_building.yml [moved from jjb/metal3/job_main_fullstack_building.yml with 98% similarity]
jjb/metal3/projects.yml
jjb/onap/cps/cps-performance-test-jobs.yaml

similarity index 97%
rename from jjb/metal3/job_bml_main_integration_tests.yml
rename to jjb/metal3/job_bml_periodic_integration_tests.yml
index 121777c48088c30f197b3f717094823e520c54a6..667a326c520f3c025b14899415a16a38f5985a38 100644 (file)
@@ -26,8 +26,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: bml_main_integration_tests
-    name: '{job_prefix}_daily_main_bml_integration_tests_{image_os}'
+    id: bml_periodic_integration_tests
+    name: '{job_prefix}_periodic_bml_integration_tests_{image_os}'
     description: "CAPM3 v1beta1 main integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
     project-type: pipeline
     defaults: global
index ead55d191becd29e19b49a8f28e9f9a2c4e5d808..80292e8d22bd0a528359771b42e5892c03ff84a3 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
diff --git a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
deleted file mode 100644 (file)
index 7a4e7d0..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-# Description:
-# ============
-# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e clusterctl upgrade tests.
-# This job can be triggered manually or through a Github pull request. It creates a
-# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
-
-- job-template:
-    id: capm3_e2e_clusterctl_upgrade_tests
-    name: '{job_prefix}_{proj}_{upgrade_from_release}_main_e2e_clusterctl_upgrade_test_{image_os}'
-    description: "CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
-    project-type: pipeline
-    defaults: global
-    disabled: False
-    concurrent: True
-    parameters:
-    - string:
-        name: PROJECT_REPO_ORG
-        default: '{org}'
-        description: 'Project github repo org name'
-    - string:
-        name: PROJECT_REPO_NAME
-        default: '{repo}'
-        description: 'Project github repo name'
-    - string:
-        name: ghprbActualCommit
-        default: 'main'
-        description: 'CI Repo branch for triggering manual build'
-    - string:
-        name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{org}/{repo}.git'
-        description: 'CI Repo URL for triggering manual build'
-    - string:
-        name: ghprbTargetBranch
-        default: 'main'
-        description: 'Target branch of the PR'
-    - string:
-        name: IMAGE_OS
-        default: '{image_os}'
-        description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
-    - string:
-        name: capm3_release_branch
-        default: 'main'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: 'main'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
-    - string:
-        name: TARGET_NODE_MEMORY
-        default: 4096
-        description: 'RAM size of the target host.'
-    - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
-    - string:
-        name: GINKGO_FOCUS
-        default: "clusterctl-upgrade"
-        description: 'Select the e2e upgrade test'
-    - string:
-        name: UPGRADE_FROM_RELEASE
-        default: '{upgrade_from}'
-        description: 'Release to upgrade from'
-
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-    - github:
-        url: https://github.com/{org}/{repo}
-
-    triggers:
-    - github-pull-request:
-        admin-list:
-          - '{ci_github_admin_user}'
-        org-list: "{ci_github_whitelist_org}"
-        cron: 'H/5 * * * *'
-        auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '.*?/test-e2e-upgrade-main-{upgrade_from_release}.*?'
-        skip-build-phrase: '/skip-test'
-        only-trigger-phrase: True
-        github-hooks: True
-        permit-all: False
-        auto-close-on-fail: False
-        allow-whitelist-orgs-as-admins: True
-        white-list-target-branches:
-          - 'main'
-        status-context: "test-e2e-upgrade-main-{upgrade_from_release}"
-        success-status: "Passed"
-        failure-status: "Failed"
-        error-status: "Error"
-        cancel-builds-on-update: True
-    pipeline-scm:
-      scm:
-      - git:
-          url: "{ci_github_repo}"
-          credentials-id: "{ci_github_jenkins_credentials_id}"
-          branches:
-            - '{branch|main}'
-          name: 'origin'
-          refspec: '+refs/heads/*:refs/remotes/origin/*'
-          wipe-workspace: True
-          honor-refspec: True
-          shallow-clone: False
-      script-path: "{ci_github_pipeline}"
-      lightweight-checkout: False
similarity index 94%
rename from jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index ab7b780e6a9a55b7b794d1187214f2326b98056c..d5352105be8461e783086f014470946bcefa4d74 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_clusterctl_upgrade_tests_prow
-    name: '{job_prefix}-clusterctl-upgrade-test-{capm3_target_branch}'
+    id: capm3_e2e_clusterctl_upgrade_tests_prow
+    name: '{job_prefix}-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
     description: "CAPM3 e2e clusterctl upgrade tests for on ubuntu."
     project-type: pipeline
     defaults: global
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
index a543280cd651a9f951f5d9646adfcb4ff608e8b8..43c49bb6d0a8f079d81a2906ebd91f687f510a50 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
index 31778d366bb480d76c2ed88f42594fa710ebd5c1..6b6f93272c6770a5f1cf3ad3422da1a389dccd4e 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
index 6146efa3d7822570fe410aefdf92d0fabe8d9880..7b53f1e80a7d606abaab189fad5e7cb4d53d4bb6 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
similarity index 83%
rename from jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index 269217e558d4fdb021a4a1b36064e14229dc3f82..e351b155fef9517f736d48b8e3a8d3ee8c5ba4a4 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_clusterctl_upgrade_tests_prow
-    name: '{job_prefix}-daily-e2e-clusterctl-upgrade-{upgrade_from_release}'
+    id: capm3_periodic_e2e_clusterctl_upgrade_tests_prow
+    name: '{job_prefix}-periodic-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
     description: "CAPM e2e clusterctl upgrade tests on ubuntu."
     project-type: pipeline
     defaults: global
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
     # End of Prow parameters
     - string:
         name: IMAGE_OS
-        default: '{image_os}'
+        default: "ubuntu"
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: capm3_release_branch
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: bmo_release_branch
-        default: 'main'
+        default: '{bmo_release_branch}'
         description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         name: GINKGO_FOCUS
         default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
-    - string:
-        name: UPGRADE_FROM_RELEASE
-        default: '{upgrade_from}'
-        description: 'Release to upgrade from'
 
     properties:
     - build-discarder:
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "jenkins/jobs/prow_integration_tests.pipeline"
+      script-path: "{e2e_feature_test_pipeline}"
       lightweight-checkout: False
similarity index 97%
rename from jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
rename to jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
index bce4400c46005dd483787994069b0b5ccb07b56a..632883ec66308d9f071b410c99b593c1f0490b4b 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_ephemeral_tests
-    name: '{job_prefix}_daily_main_e2e_ephemeral_test_{image_os}'
+    id: capm3_periodic_e2e_ephemeral_tests
+    name: '{job_prefix}_periodic_e2e_ephemeral_test_{image_os}'
     description: "CAPM3 v1beta1 e2e tests in ephemeral cluster for {repo[org]}/{repo[name]} on centos."
     project-type: pipeline
     defaults: global
similarity index 95%
rename from jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
index 22946c8ef1b01eec2590071e3fad0dfeee688617..35ec7722863078267f0ab1a0e1fb7ec42d1e54c5 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_feature_tests_prow
-    name: '{job_prefix}-daily-{image_os}-e2e-feature-test-{capm3_target_branch}'
+    id: capm3_periodic_e2e_feature_tests_prow
+    name: '{job_prefix}-periodic-{image_os}-e2e-feature-test-{capm3_target_branch}'
     description: "CAPM3 {capm3_version} e2e tests on {image_os}."
     project-type: pipeline
     defaults: global
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: '{capm3_branch}'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: '{capm3_branch}'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
index 2aff7ba80ccb61fb4183f64d79dc4ddc949fe410..e6746d4b2a261f8d0cda55e0916696de997d16b0 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_integration_tests
-    name: '{job_prefix}_daily_{capm3_target_branch}_e2e_integration_test_{image_os}'
+    id: capm3_periodic_e2e_integration_tests
+    name: '{job_prefix}_periodic_{capm3_target_branch}_e2e_integration_test_{image_os}'
     description: "CAPM3 {capm3_version} e2e integration tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global
similarity index 96%
rename from jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
index ad834a51dfef1a7998934da6d74e2e74f8acf266..d133633700017a70770536b4f984470748d45c97 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_integration_tests_prow
-    name: '{job_prefix}-daily-{image_os}-e2e-integration-test-{capm3_target_branch}'
+    id: capm3_periodic_e2e_integration_tests_prow
+    name: '{job_prefix}-periodic-{image_os}-e2e-integration-test-{capm3_target_branch}'
     description: "CAPM3 {capm3_version} e2e integration tests on {image_os}."
     project-type: pipeline
     defaults: global
similarity index 95%
rename from jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
rename to jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
index e85256eb89eb508a5f800656a20a250459bf690c..02b2531ed3aed59eac0e29a9b771e393e4e31ac7 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_k8s_upgrade_tests_prow
-    name: '{job_prefix}-daily-e2e-{k8s_versions}-upgrade-{capm3_target_branch}'
+    id: capm3_periodic_e2e_k8s_upgrade_tests_prow
+    name: '{job_prefix}-periodic-e2e-{k8s_versions}-upgrade-{capm3_target_branch}'
     description: "CAPM3 e2e k8s upgrade tests on ubuntu."
     project-type: pipeline
     defaults: global
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
similarity index 96%
rename from jjb/metal3/job_capm3_main_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_integration_tests.yml
index b34f57f12d30609c460b2225a40a8e4eb6506b02..b7f1ebe7c528dab161def42ef75717ad8f6f33f8 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_integration_tests
-    name: '{job_prefix}_daily_{capm3_target_branch}_integration_test_{image_os}'
+    id: capm3_periodic_integration_tests
+    name: '{job_prefix}_periodic_{capm3_target_branch}_integration_test_{image_os}'
     description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
index 6a4dc89a68306bfcb6515877769ea87fd0a5ee01..4000bb6c84ad7f0ae2b018634a0fc767b7dde104 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-dev-env-integration-{capm3_target_branch}{trigger_postfix}(\s(.|\n)*)?'
+        trigger-phrase: '.*?/test-{image_os}-dev-env-integration-{capm3_target_branch}{trigger_postfix}.*?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
index 8b9412f3e86141614490ead27edbe536e4ba4a3d..5ccd5e23e94866ef9a5c20c63166897a13bbc3dd 100644 (file)
@@ -1,4 +1,3 @@
----
 #
 # ============LICENSE_START=======================================================
 #  Copyright (C) 2019 Nordix Foundation.
@@ -70,7 +69,7 @@
     triggers:
     - github-pull-request:
         admin-list:
-          - '{ci_github_admin_user}'
+        - '{ci_github_admin_user}'
         org-list: "{ci_github_whitelist_org}"
         auth-id: "{ci_ghprb_auth_id}"
         trigger-phrase: '.*?/test-ironic-image-build.*?'
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
-          - 'main'
-          - 'release-23.1'
-          - 'release-24.0'
+        - 'main'
+        - 'release-23.1'
+        - 'release-24.0'
+        - 'release-24.1'
         status-context: "test-ironic-image-build"
         success-status: "Passed"
         failure-status: "Failed"
@@ -95,7 +95,7 @@
           url: "{ci_github_repo}"
           credentials-id: "{ci_github_jenkins_credentials_id}"
           branches:
-            - '{branch|main}'
+          - '{branch|main}'
           name: 'origin'
           refspec: '+refs/heads/*:refs/remotes/origin/*'
           wipe-workspace: True
index 3ca02dd2621c5597a16cfa7eb80216c83ceec79c..88ad06b4202d715aacb069d8fc0f3917cf253be9 100644 (file)
@@ -26,7 +26,7 @@
 
 - job-template:
     id: keep_capm3_e2e_clusterctl_upgrade_tests_prow
-    name: '{job_prefix}-keep-e2e-clusterctl-upgrade-{upgrade_from_release}'
+    name: '{job_prefix}-keep-e2e-clusterctl-upgrade-test-{capm3_target_branch}'
     description: "Keep CAPM3 e2e upgrade tests on {image_os}."
     project-type: pipeline
     defaults: global
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
         description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
     - string:
         name: capm3_release_branch
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'The target branch of CAPM3 to be used for this test'
     - string:
         name: bmo_release_branch
-        default: 'main'
+        default: '{bmo_release_branch}'
         description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: 'v1beta1'
-        description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
     - string:
         name: TARGET_NODE_MEMORY
         default: 4096
         name: GINKGO_FOCUS
         default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
-    - string:
-        name: UPGRADE_FROM_RELEASE
-        default: '{upgrade_from}'
-        description: 'Release to upgrade from'
 
     properties:
     - build-discarder:
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "jenkins/jobs/prow_integration_tests.pipeline"
+      script-path: "{e2e_feature_test_pipeline}"
       lightweight-checkout: False
index 8c7cef7778488876369d92433d9c424c32c40c91..980acb456632b036c984df9df3f887c0a14d77e0 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
index d2cd586650286a62c81776f5b0b8cd97f2425b1d..2defcad57e41581422380bdbfd24d23a89b01b4c 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
index ba7704994f76046a78e5893b286c5ab5385d991e..b3164c801f5cf7565608ee0688fce17cffd2d964 100644 (file)
         description: 'Project github repo name'
     - string:
         name: PULL_BASE_REF
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Ref name of the base branch'
     - string:
         name: PULL_PULL_SHA
-        default: 'main'
+        default: '{capm3_release_branch}'
         description: 'Pull request head SHA'
     - string:
         name: PULL_NUMBER
similarity index 74%
rename from jjb/metal3/job_main_clean.yml
rename to jjb/metal3/job_periodic_clean.yml
index 2ad3fa4fd70128d889e888c4dcc194a976e0a4ea..24610662960531134a86e50ee54b58ea00d5df0a 100644 (file)
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: main_clean
-    name: '{job_prefix}_daily_main_integration_tests_cleanup'
+    id: periodic_clean
+    name: '{job_prefix}_periodic_integration_tests_cleanup'
     description: "CAPM3 integration tests cleanup"
     project-type: pipeline
     defaults: global
     disabled: False
     concurrent: True
     parameters:
+    # Parameters set by Prow
     - string:
-        name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
+        name: BUILD_ID
+        description: 'Used by Prow when triggering jobs'
+    - string:
+        name: PROW_JOB_ID
+        description: 'Used by Prow when triggering jobs'
+    - string:
+        name: REPO_OWNER
+        default: 'metal3-io'
         description: 'Project github repo org name'
     - string:
-        name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
+        name: REPO_NAME
+        default: 'cluster-api-provider-metal3'
         description: 'Project github repo name'
     - string:
-        name: ghprbActualCommit
+        name: PULL_BASE_REF
+        default: 'main'
+        description: 'Ref name of the base branch'
+    - string:
+        name: PULL_PULL_SHA
         default: 'main'
-        description: 'CI Repo branch for triggering manual build'
+        description: 'Pull request head SHA'
     - string:
-        name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
-        description: 'CI Repo URL for triggering manual build'
+        name: PULL_NUMBER
+        description: 'Pull request number'
+    # End of Prow parameters
 
     properties:
     - build-discarder:
similarity index 98%
rename from jjb/metal3/job_main_fullstack_building.yml
rename to jjb/metal3/job_periodic_fullstack_building.yml
index fbb3ecdb01d96e071c0786b20884f759f5fe2049..2ee904e70ae318ca0925d4751b4f50bd3180973f 100644 (file)
@@ -25,8 +25,8 @@
 # The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
-    id: main_fullstack_building
-    name: '{job_prefix}_daily_main_fullstack_building'
+    id: periodic_fullstack_building
+    name: '{job_prefix}_daily_periodic_fullstack_building'
     description: "Build and test a Metal3 cluster stack from source."
     project-type: pipeline
     defaults: global
index 036b2def1bc1ba2e1be057b6a60806959d6f1962..edd1133baf6a789c2c1fafa2be2001158dd2c447 100644 (file)
@@ -38,7 +38,7 @@
     - openstack_node_image_building
     - docker_image_building
     - update_nordix_repos
-    - main_fullstack_building
+    - periodic_fullstack_building
     - fullstack_building_test
     - metal3_dev_tools_integration_test:
         image_os:
         name_postfix: '_ironic_from_source'
         trigger_postfix: '-ironic-source'
         ironic_install_type: 'source'
+        target_branches:
+        - 'main'
+        - 'release-23.1'
+        - 'release-24.0'
+        - 'release-24.1'
     - ironic_image:
         repo: ironic-image
     - ironic_ipa_downloader:
     - ubuntu
     - centos
     jobs:
-    - capm3_main_integration_tests:
+    - capm3_periodic_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             repo: project-infra
             branch: '${{ghprbActualCommit}}'
             ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bml_main_integration_tests:
+    - bml_periodic_integration_tests:
         repo: metal3-dev-env
 
 - project:
     name: 'project_infra_cleanup'
-    repo:
-      org: "metal3-io"
-      name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - main_clean
+    - periodic_clean
 
 - project:
     name: 'project_infra'
     - ubuntu
     - centos
     jobs:
-    - capm3_e2e_clusterctl_upgrade_tests:
-        upgrade_from_release:
-        - from-release-1-6:
-            upgrade_from: v1.6.
-        - from-release-1-5:
-            upgrade_from: v1.5.
-        - from-release-1-4:
-            upgrade_from: v1.4.
-        - from-release-1-3:
-            upgrade_from: v1.3.
-        - from-release-0-5:
-            upgrade_from: v0.5.
-        exclude:
-        - image_os: centos
     - capm3_e2e_k8s_upgrade_tests:
         k8s_versions:
         - 1-28-1-29:
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'main'
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'main'
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'main'
-            - 'release-1.4'
-            - 'release-0.3'
-    - capm3_main_e2e_integration_tests_prow:
+    - capm3_periodic_e2e_integration_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'main'
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'main'
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'main'
-            - 'release-1.4'
-            - 'release-0.3'
     - capm3_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
-    - capm3_main_e2e_feature_tests_prow:
+    - capm3_periodic_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: main
             capm3_release_branch: main
             bmo_release_branch: main
             schedule: "H 2 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.6
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             schedule: "H 8 * * *"
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.5
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             schedule: "H 11 * * *"
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.4
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             schedule: "H 5 * * *"
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
-    - capm3_clusterctl_upgrade_tests_prow:
+    - capm3_e2e_clusterctl_upgrade_tests_prow:
         capm3_target_branch:
         - main:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
         exclude:
         - image_os: centos
     - capm3_e2e_k8s_upgrade_tests_prow:
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
             capm3_release_branch: main
             capm3_target_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             capm3_target_branch: release-1-4
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
         exclude:
         - image_os: centos
-    - capm3_main_e2e_clusterctl_upgrade_tests_prow:
-        upgrade_from_release:
-        - from-release-1-6:
-            upgrade_from: v1.6.
-        - from-release-1-5:
-            upgrade_from: v1.5.
-        - from-release-1-4:
-            upgrade_from: v1.4.
-        - from-release-1-3:
-            upgrade_from: v1.3.
-        - from-release-0-5:
-            upgrade_from: v0.5.
+    - capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
+        capm3_target_branch:
+        - main:
+            capm3_release_branch: main
+            bmo_release_branch: main
+        - release-1-6:
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+        - release-1-5:
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+        - release-1-4:
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
         exclude:
         - image_os: centos
-    - capm3_main_e2e_k8s_upgrade_tests_prow:
+    - capm3_periodic_e2e_k8s_upgrade_tests_prow:
         k8s_versions:
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
         exclude:
         - image_os: centos
     - keep_capm3_e2e_clusterctl_upgrade_tests_prow:
-        upgrade_from_release:
-        - from-release-1-6:
-            upgrade_from: v1.6.
-        - from-release-1-5:
-            upgrade_from: v1.5.
-        - from-release-1-4:
-            upgrade_from: v1.4.
-        - from-release-1-3:
-            upgrade_from: v1.3.
-        - from-release-0-5:
-            upgrade_from: v0.5.
+        capm3_target_branch:
+        - main:
+            capm3_release_branch: main
+            bmo_release_branch: main
+        - release-1-6:
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+        - release-1-5:
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+        - release-1-4:
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
         exclude:
         - image_os: centos
     - keep_capm3_e2e_k8s_upgrade_tests_prow:
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             capm3_target_branch: release-1-4
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
         exclude:
         - image_os: centos
 
 - project:
-    name: "capm3-main-tests"
+    name: "capm3-periodic-tests"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     - ubuntu
     - centos
     jobs:
-    - capm3_main_e2e_ephemeral_tests:
+    - capm3_periodic_e2e_ephemeral_tests:
         exclude:
         - image_os: ubuntu
-    - capm3_main_e2e_integration_tests:
+    - capm3_periodic_e2e_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
index ecbdd3c03aa60ba1f01252ccfe5b845cd57ab3ff..7542a1ccdc05c653576d332d420eedd4bf370e30 100644 (file)
@@ -1,7 +1,7 @@
 ---
 #
 # ============LICENSE_START=======================================================
-#  Copyright (C) 2023 Nordix Foundation.
+#  Copyright (C) 2023-2024 Nordix Foundation.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.