Merge "Add dev-env-integration test to prow"
diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_periodic_integration_tests.yml
similarity index 97%
rename from jjb/metal3/job_bml_main_integration_tests.yml
rename to jjb/metal3/job_bml_periodic_integration_tests.yml
index 121777c..667a326 100644
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_periodic_integration_tests.yml
@@ -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
diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml
index ead55d1..80292e8 100644
--- a/jjb/metal3/job_capm3_e2e_basic_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml
@@ -48,11 +48,11 @@
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
index 7a4e7d0..0000000
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
+++ /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
diff --git a/jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
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 ab7b780..d535210 100644
--- a/jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
@@ -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
@@ -50,11 +50,11 @@
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_feature_tests_prow.yml b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
index a543280..43c49bb 100644
--- a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
@@ -50,11 +50,11 @@
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_integration_tests_prow.yml b/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
index 31778d3..6b6f932 100644
--- a/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_integration_tests_prow.yml
@@ -50,11 +50,11 @@
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_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
index 6146efa..7b53f1e 100644
--- a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests_prow.yml
@@ -50,11 +50,11 @@
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_main_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
deleted file mode 100644
index 269217e..0000000
--- a/jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests_prow.yml
+++ /dev/null
@@ -1,123 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 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.
-# 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) main e2e upgrade tests.
-# This job can be triggered manually or periodically by the CI system. It creates a
-# 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}'
- description: "CAPM e2e clusterctl upgrade tests on ubuntu."
- project-type: pipeline
- defaults: global
- disabled: False
- concurrent: True
- parameters:
- # Parameters set by Prow
- - string:
- 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: REPO_NAME
- default: 'cluster-api-provider-metal3'
- description: 'Project github repo name'
- - string:
- name: PULL_BASE_REF
- default: 'main'
- description: 'Ref name of the base branch'
- - string:
- name: PULL_PULL_SHA
- default: 'main'
- description: 'Pull request head SHA'
- - string:
- name: PULL_NUMBER
- description: 'Pull request number'
- # End of Prow parameters
- - 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
-
- triggers:
- - timed: "H 1 * * *"
-
- 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: "jenkins/jobs/prow_integration_tests.pipeline"
- lightweight-checkout: False
diff --git a/jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
similarity index 88%
copy from jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml
copy to jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index ab7b780..e351b15 100644
--- a/jjb/metal3/job_capm3_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -20,14 +20,14 @@
# 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
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) main e2e upgrade tests.
+# This job can be triggered manually or periodically by the CI system. It creates a
# 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}'
- description: "CAPM3 e2e clusterctl upgrade tests for on ubuntu."
+ 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
disabled: False
@@ -50,11 +50,11 @@
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
@@ -84,6 +84,7 @@
name: GINKGO_FOCUS
default: "clusterctl-upgrade"
description: 'Select the e2e upgrade test'
+
properties:
- build-discarder:
days-to-keep: 30
@@ -91,7 +92,9 @@
artifact-days-to-keep: -1
artifact-num-to-keep: -1
- triggers: []
+ triggers:
+ - timed: "H 1 * * *"
+
pipeline-scm:
scm:
- git:
diff --git a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
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 bce4400..632883e 100644
--- a/jjb/metal3/job_capm3_main_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
@@ -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
diff --git a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
similarity index 94%
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 22946c8..35ec772 100644
--- a/jjb/metal3/job_capm3_main_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
@@ -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
@@ -50,11 +50,11 @@
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
diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
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 2aff7ba..e6746d4 100644
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
@@ -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
diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
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 ad834a5..d133633 100644
--- a/jjb/metal3/job_capm3_main_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_integration_tests_prow.yml
@@ -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
diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
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 e85256e..02b2531 100644
--- a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
@@ -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
@@ -50,11 +50,11 @@
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_main_integration_tests.yml b/jjb/metal3/job_capm3_periodic_integration_tests.yml
similarity index 96%
rename from jjb/metal3/job_capm3_main_integration_tests.yml
rename to jjb/metal3/job_capm3_periodic_integration_tests.yml
index b34f57f..b7f1ebe 100644
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_integration_tests.yml
@@ -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
diff --git a/jjb/metal3/job_dev_env_integration_tests.yml b/jjb/metal3/job_dev_env_integration_tests.yml
index 6a4dc89..4000bb6 100644
--- a/jjb/metal3/job_dev_env_integration_tests.yml
+++ b/jjb/metal3/job_dev_env_integration_tests.yml
@@ -104,7 +104,7 @@
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
diff --git a/jjb/metal3/job_ironic_image_build_test.yml b/jjb/metal3/job_ironic_image_build_test.yml
index 8b9412f..5ccd5e2 100644
--- a/jjb/metal3/job_ironic_image_build_test.yml
+++ b/jjb/metal3/job_ironic_image_build_test.yml
@@ -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.*?'
@@ -81,9 +80,10 @@
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
diff --git a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index 3ca02dd..88ad06b 100644
--- a/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
@@ -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
@@ -50,11 +50,11 @@
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
@@ -66,21 +66,13 @@
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
description: 'RAM size of the target host.'
@@ -96,10 +88,6 @@
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:
@@ -122,5 +110,5 @@
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
diff --git a/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml
index 8c7cef7..980acb4 100644
--- a/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml
@@ -50,11 +50,11 @@
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_keep_capm3_e2e_integration_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
index d2cd586..2defcad 100644
--- a/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
@@ -50,11 +50,11 @@
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_keep_capm3_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
index ba77049..b3164c8 100644
--- a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
@@ -50,11 +50,11 @@
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_main_clean.yml b/jjb/metal3/job_periodic_clean.yml
similarity index 75%
rename from jjb/metal3/job_main_clean.yml
rename to jjb/metal3/job_periodic_clean.yml
index 2ad3fa4..2461066 100644
--- a/jjb/metal3/job_main_clean.yml
+++ b/jjb/metal3/job_periodic_clean.yml
@@ -26,30 +26,41 @@
# 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: 'CI Repo branch for triggering manual build'
+ description: 'Ref name of the base branch'
- string:
- name: ghprbAuthorRepoGitUrl
- default: 'https://github.com/{repo[org]}/{repo[name]}.git'
- description: 'CI Repo URL for triggering manual build'
+ name: PULL_PULL_SHA
+ default: 'main'
+ description: 'Pull request head SHA'
+ - string:
+ name: PULL_NUMBER
+ description: 'Pull request number'
+ # End of Prow parameters
properties:
- build-discarder:
diff --git a/jjb/metal3/job_main_fullstack_building.yml b/jjb/metal3/job_periodic_fullstack_building.yml
similarity index 98%
rename from jjb/metal3/job_main_fullstack_building.yml
rename to jjb/metal3/job_periodic_fullstack_building.yml
index fbb3ecd..2ee904e 100644
--- a/jjb/metal3/job_main_fullstack_building.yml
+++ b/jjb/metal3/job_periodic_fullstack_building.yml
@@ -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
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 036b2de..edd1133 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -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:
@@ -78,6 +78,11 @@
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:
@@ -194,7 +199,7 @@
- ubuntu
- centos
jobs:
- - capm3_main_integration_tests:
+ - capm3_periodic_integration_tests:
capm3_target_branch:
- main:
capi_version: v1beta1
@@ -234,17 +239,14 @@
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'
@@ -274,20 +276,6 @@
- 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:
@@ -629,36 +617,22 @@
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
@@ -679,35 +653,21 @@
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:
@@ -715,59 +675,44 @@
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 * * *"
@@ -778,65 +723,35 @@
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:
@@ -848,8 +763,6 @@
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
@@ -857,8 +770,6 @@
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
@@ -866,8 +777,6 @@
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
@@ -875,9 +784,6 @@
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
@@ -885,9 +791,6 @@
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
@@ -895,26 +798,25 @@
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
@@ -923,8 +825,6 @@
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
@@ -932,8 +832,6 @@
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
@@ -965,17 +863,19 @@
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:
@@ -987,8 +887,6 @@
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
@@ -996,8 +894,6 @@
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
@@ -1005,8 +901,6 @@
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
@@ -1014,9 +908,6 @@
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
@@ -1024,9 +915,6 @@
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
@@ -1034,14 +922,11 @@
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"
@@ -1049,10 +934,10 @@
- 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
diff --git a/jjb/onap/cps/cps-performance-test-jobs.yaml b/jjb/onap/cps/cps-performance-test-jobs.yaml
index ecbdd3c..7542a1c 100644
--- a/jjb/onap/cps/cps-performance-test-jobs.yaml
+++ b/jjb/onap/cps/cps-performance-test-jobs.yaml
@@ -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.