Merge "Plot more performance test graphs on the CPS performance report"
authorAndrew Fenner <Andrew.Fenner@est.tech>
Mon, 22 Apr 2024 13:07:56 +0000 (13:07 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Mon, 22 Apr 2024 13:07:56 +0000 (13:07 +0000)
21 files changed:
jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml [deleted file]
jjb/metal3/job_capm3_e2e_basic_tests.yml
jjb/metal3/job_capm3_e2e_feature_tests.yml [deleted file]
jjb/metal3/job_capm3_e2e_integration_tests.yml [deleted file]
jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml [deleted file]
jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml [deleted file]
jjb/metal3/job_dev_env_integration_tests.yml [deleted file]
jjb/metal3/job_dev_env_integration_tests_prow.yml
jjb/metal3/job_dev_env_periodic_integration_tests_prow.yaml [moved from jjb/metal3/job_dev_env_main_integration_tests_prow.yaml with 97% similarity]
jjb/metal3/job_keep_capm3_e2e_basic_tests.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_feature_tests.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_feature_tests_prow.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_integration_tests.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml [deleted file]
jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml [deleted file]
jjb/metal3/job_keep_integration_vm.yml [deleted file]
jjb/metal3/projects.yml
jjb/onap/cps/cps-performance-test-jobs.yaml

diff --git a/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml b/jjb/metal3/job_capm3_clusterctl_upgrade_tests.yml
deleted file mode 100644 (file)
index 6d52057..0000000
+++ /dev/null
@@ -1,122 +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) 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_clusterctl_upgrade_tests
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_clusterctl_upgrade_test'
-    description: "CAPM3 e2e clusterctl upgrade tests for {org}/{repo} on ubuntu."
-    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: "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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - 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'
-    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-clusterctl-upgrade-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "test-e2e-clusterctl-upgrade-{capm3_target_branch}"
-        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: "{e2e_feature_test_pipeline}"
-      lightweight-checkout: False
index 80292e8d22bd0a528359771b42e5892c03ff84a3..0be105003373ad320f5729f6e17ecd1b2de27c5b 100644 (file)
             bmo_release_branch: main
             target_branches:
             - 'main'
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            target_branches:
+            - 'main'
+            - 'release-1.7'
+            - 'release-0.6'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
diff --git a/jjb/metal3/job_capm3_e2e_feature_tests.yml b/jjb/metal3/job_capm3_e2e_feature_tests.yml
deleted file mode 100644 (file)
index d48e7f9..0000000
+++ /dev/null
@@ -1,131 +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 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_feature_tests
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_e2e_feature_test_{image_os}'
-    description: "CAPM3 {capm3_version} e2e 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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        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: "features"
-        description: 'Select the e2e integration test'
-
-    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-{image_os}-e2e-feature-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "test-{image_os}-e2e-feature-{capm3_target_branch}"
-        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: "{e2e_feature_test_parallel_pipeline}"
-      lightweight-checkout: False
diff --git a/jjb/metal3/job_capm3_e2e_integration_tests.yml b/jjb/metal3/job_capm3_e2e_integration_tests.yml
deleted file mode 100644 (file)
index 995dbb4..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2022 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 integration 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_integration_tests
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_e2e_integration_test_{image_os}'
-    description: "CAPM3 {capm3_version} e2e integration 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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        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: "integration"
-        description: 'Select the e2e integration test'
-
-    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-{image_os}-e2e-integration-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "test-{image_os}-e2e-integration-{capm3_target_branch}"
-        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_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
deleted file mode 100644 (file)
index c85d5b1..0000000
+++ /dev/null
@@ -1,143 +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 k8s 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_k8s_upgrade_tests
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_e2e_{k8s_versions}_upgrade_test_{image_os}'
-    description: "CAPM3 e2e k8s 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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        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.'
-    - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
-    - string:
-        name: GINKGO_FOCUS
-        default: "k8s-upgrade"
-        description: 'Select the e2e upgrade test'
-    - string:
-        name: KUBERNETES_VERSION_UPGRADE_FROM
-        default: '{k8s_version_upgrade_from}'
-        description: 'Kubernetes version upgrade from'
-    - string:
-        name: KUBERNETES_VERSION_UPGRADE_TO
-        default: '{k8s_version_upgrade_to}'
-        description: 'Kubernetes version upgrade to'
-    - string:
-        name: KUBECTL_SHA256
-        default: '{kubectl_sha256}'
-        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_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-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}"
-        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_periodic_e2e_integration_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_integration_tests.yml
deleted file mode 100644 (file)
index e6746d4..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2023 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 integration 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_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
-    disabled: False
-    concurrent: True
-    parameters:
-    - string:
-        name: PROJECT_REPO_ORG
-        default: '{repo[org]}'
-        description: 'Project github repo org name'
-    - string:
-        name: PROJECT_REPO_NAME
-        default: '{repo[name]}'
-        description: 'Project github repo name'
-    - string:
-        name: ghprbActualCommit
-        default: '{capm3_release_branch}'
-        description: 'CI Repo branch for triggering manual build'
-    - string:
-        name: ghprbAuthorRepoGitUrl
-        default: 'https://github.com/{repo[org]}/{repo[name]}.git'
-        description: 'CI Repo URL for triggering manual build'
-    - string:
-        name: ghprbTargetBranch
-        default: '{capm3_release_branch}'
-        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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        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: "integration"
-        description: 'Select the e2e integration test'
-
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-
-    triggers:
-      - timed: "H 4 * * *"
-
-    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_dev_env_integration_tests.yml b/jjb/metal3/job_dev_env_integration_tests.yml
deleted file mode 100644 (file)
index 4000bb6..0000000
+++ /dev/null
@@ -1,133 +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) integration 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: dev_env_integration_tests
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_dev_env_integration_test_{image_os}{name_postfix}'
-    description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os} with ironic installed from {ironic_install_type}."
-    project-type: pipeline
-    defaults: integration-default-values
-    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: capm3_release_branch
-        default: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - 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: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_MEMORY
-        default: 4096
-        description: 'RAM size of the target host.'
-    - string:
-        name: IRONIC_INSTALL_TYPE
-        default: '{ironic_install_type}'
-        description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment'
-    - string:
-        name: IRONIC_USE_MARIADB
-        default: '{ironic_use_mariadb}'
-        description: 'If Ironic should use MariaDB or not.'
-    - string:
-        name: BUILD_MARIADB_IMAGE_LOCALLY
-        default: '{build_mariadb_image_locally}'
-    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-{image_os}-dev-env-integration-{capm3_target_branch}{trigger_postfix}.*?'
-        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: "{target_branches}"
-        status-context: "test-{image_os}-dev-env-integration-{capm3_target_branch}"
-        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: "{dev_env_integration_test_pipeline}"
-      lightweight-checkout: False
index ab0ef792694dd0eee4331274aa978cee4e477cc2..323edd9c401aed78655c6671207f835b0f95e204 100644 (file)
@@ -26,7 +26,7 @@
 
 - job-template:
     id: dev_env_integration_tests_prow
-    name: 'dev_env_integration_test_{image_os}_{capm3_target_branch}_{name_postfix}'
+    name: 'dev-env-integration-test-{image_os}-{capm3_target_branch}{name_postfix}'
     description: "CAPM3 {capm3_version} integration tests on {image_os} with ironic installed from {ironic_install_type}."
     project-type: pipeline
     defaults: integration-default-values
similarity index 97%
rename from jjb/metal3/job_dev_env_main_integration_tests_prow.yaml
rename to jjb/metal3/job_dev_env_periodic_integration_tests_prow.yaml
index 0113fc933feb42937f44b66f9da17bfe0a537d4e..568bc949c185b54845c2fa7f6ee68cbe1cf3f85f 100644 (file)
@@ -26,7 +26,7 @@
 
 - job-template:
     id: dev_env_periodic_integration_tests_prow
-    name: 'dev_env_periodic_integration_test_{image_os}_{capm3_target_branch}_{name_postfix}'
+    name: 'dev-env-periodic-integration-test-{image_os}-{capm3_target_branch}{name_postfix}'
     description: "CAPM3 {capm3_version} integration tests on {image_os} with ironic installed from {ironic_install_type}."
     project-type: pipeline
     defaults: integration-default-values
diff --git a/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml b/jjb/metal3/job_keep_capm3_e2e_basic_tests.yml
deleted file mode 100644 (file)
index 5536dc1..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2023 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 basic integration 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: keep_capm3_e2e_basic_tests
-    name: '{job_prefix}_keep_{proj}_e2e_basic_test_{image_os}'
-    description: "CAPM3 e2e basic integration 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: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "basic"
-        description: 'Select the e2e basic integration test'
-
-    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: '.*?/keep-test-{image_os}-e2e-basic-main.*?'
-        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: "keep-test-{image_os}-e2e-basic-main"
-        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_keep_capm3_e2e_clusterctl_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
deleted file mode 100644 (file)
index d54ec8c..0000000
+++ /dev/null
@@ -1,140 +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: keep_capm3_e2e_clusterctl_upgrade_tests
-    name: '{job_prefix}_keep_{proj}_{upgrade_from_release}_main_e2e_clusterctl_upgrade_test_{image_os}'
-    description: "Keep 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: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - 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: '.*?/keep-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: "keep-test-e2e-upgrade-{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_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests_prow.yml
deleted file mode 100644 (file)
index 88ad06b..0000000
+++ /dev/null
@@ -1,114 +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) 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: keep_capm3_e2e_clusterctl_upgrade_tests_prow
-    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
-    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: '{capm3_release_branch}'
-        description: 'Ref name of the base branch'
-    - string:
-        name: PULL_PULL_SHA
-        default: '{capm3_release_branch}'
-        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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - 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: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "clusterctl-upgrade"
-        description: 'Select the e2e upgrade test'
-
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-
-    triggers: []
-
-    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: "{e2e_feature_test_pipeline}"
-      lightweight-checkout: False
diff --git a/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml b/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
deleted file mode 100644 (file)
index a68893c..0000000
+++ /dev/null
@@ -1,134 +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 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: keep_capm3_e2e_feature_tests
-    name: '{job_prefix}_keep_{proj}_{capm3_target_branch}_e2e_feature_test_{image_os}'
-    description: "CAPM3 {capm3_version} e2e 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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        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: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "features"
-        description: 'Select the e2e integration test'
-    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: '.*?/keep-test-{image_os}-e2e-feature-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "keep-test-{image_os}-e2e-feature-{capm3_target_branch}"
-        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: "{e2e_feature_test_parallel_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
deleted file mode 100644 (file)
index 980acb4..0000000
+++ /dev/null
@@ -1,121 +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 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: keep_capm3_e2e_feature_tests_prow
-    name: '{job_prefix}-keep-{image_os}-e2e-feature-test-{capm3_target_branch}'
-    description: "CAPM3 {capm3_version} e2e tests for on {image_os}."
-    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: '{capm3_release_branch}'
-        description: 'Ref name of the base branch'
-    - string:
-        name: PULL_PULL_SHA
-        default: '{capm3_release_branch}'
-        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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        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: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "features"
-        description: 'Select the e2e integration test'
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-
-    triggers: []
-
-    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: "{e2e_feature_test_parallel_pipeline}"
-      lightweight-checkout: False
diff --git a/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
deleted file mode 100644 (file)
index ddb9e7c..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2023 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 integration 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: keep_capm3_e2e_integration_tests
-    name: '{job_prefix}_keep_{proj}_e2e_integration_test_{image_os}'
-    description: "CAPM3 e2e integration 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: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "integration"
-        description: 'Select the e2e integration test'
-
-    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: '.*?/keep-test-{image_os}-e2e-integration-main.*?'
-        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: "keep-test-{image_os}-e2e-integration-main"
-        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_keep_capm3_e2e_integration_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests_prow.yml
deleted file mode 100644 (file)
index 2defcad..0000000
+++ /dev/null
@@ -1,121 +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) e2e integration 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: keep_capm3_e2e_integration_tests_prow
-    name: 'keep-{job_prefix}-{image_os}-e2e-integration-test-{capm3_target_branch}'
-    description: "CAPM3 {capm3_version} e2e integration tests on {image_os}."
-    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: '{capm3_release_branch}'
-        description: 'Ref name of the base branch'
-    - string:
-        name: PULL_PULL_SHA
-        default: '{capm3_release_branch}'
-        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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version. E.g. v1beta1.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        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: "integration"
-        description: 'Select the e2e integration test'
-    - string:
-        name: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-
-    triggers: []
-
-    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_keep_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
deleted file mode 100644 (file)
index 89a9910..0000000
+++ /dev/null
@@ -1,147 +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 k8s 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: keep_capm3_e2e_k8s_upgrade_tests
-    name: '{job_prefix}_keep_{proj}_{capm3_target_branch}_e2e_{k8s_versions}_upgrade_test_{image_os}'
-    description: "Keep CAPM3 e2e k8s 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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        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.'
-    - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
-    - string:
-        name: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "k8s-upgrade"
-        description: 'Select the e2e upgrade test'
-    - string:
-        name: KUBERNETES_VERSION_UPGRADE_FROM
-        default: '{k8s_version_upgrade_from}'
-        description: 'Kubernetes version upgrade from'
-    - string:
-        name: KUBERNETES_VERSION_UPGRADE_TO
-        default: '{k8s_version_upgrade_to}'
-        description: 'Kubernetes version upgrade to'
-    - string:
-        name: KUBECTL_SHA256
-        default: '{kubectl_sha256}'
-        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_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: '.*?/keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "keep-test-e2e-{k8s_versions}-upgrade-{capm3_target_branch}"
-        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_keep_capm3_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests_prow.yml
deleted file mode 100644 (file)
index b3164c8..0000000
+++ /dev/null
@@ -1,133 +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) e2e k8s 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: keep_capm3_e2e_k8s_upgrade_tests_prow
-    name: '{job_prefix}-keep-e2e-{k8s_versions}-upgrade-test-{capm3_target_branch}'
-    description: "Keep CAPM3 e2e k8s upgrade tests on {image_os}."
-    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: '{capm3_release_branch}'
-        description: 'Ref name of the base branch'
-    - string:
-        name: PULL_PULL_SHA
-        default: '{capm3_release_branch}'
-        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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        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.'
-    - string:
-        name: TESTS_FOR
-        default: "e2e_tests"
-        description: 'Tests using the e2e framework.'
-    - string:
-        name: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-    - string:
-        name: GINKGO_FOCUS
-        default: "k8s-upgrade"
-        description: 'Select the e2e upgrade test'
-    - string:
-        name: KUBERNETES_VERSION_UPGRADE_FROM
-        default: '{k8s_version_upgrade_from}'
-        description: 'Kubernetes version upgrade from'
-    - string:
-        name: KUBERNETES_VERSION_UPGRADE_TO
-        default: '{k8s_version_upgrade_to}'
-        description: 'Kubernetes version upgrade to'
-    - string:
-        name: KUBECTL_SHA256
-        default: '{kubectl_sha256}'
-        description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION_UPGRADE_FROM'
-
-    properties:
-    - build-discarder:
-        days-to-keep: 30
-        num-to-keep: 300
-        artifact-days-to-keep: -1
-        artifact-num-to-keep: -1
-
-    triggers: []
-    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_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
deleted file mode 100644 (file)
index e2ed626..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
----
-#
-# ============LICENSE_START=======================================================
-#  Copyright (C) 2019 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)
-# keeping integration test vm.
-# 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: keep_integration_tests
-    name: '{job_prefix}_{proj}_keep_{capm3_target_branch}_test_{image_os}_alive'
-    description: "CAPM3 {capm3_version} integration tests for keeping the vm 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: '{capm3_release_branch}'
-        description: 'The target branch of CAPM3 to be used for this test'
-    - string:
-        name: bmo_release_branch
-        default: '{bmo_release_branch}'
-        description: 'The target branch of BMO to be used for this test'
-    - string:
-        name: CAPI_VERSION
-        default: '{capi_version}'
-        description: 'Cluster API version.'
-    - string:
-        name: CAPM3_VERSION
-        default: '{capm3_version}'
-        description: 'Cluster API provider Metal3 version.'
-    - string:
-        name: TARGET_NODE_MEMORY
-        default: 4096
-        description: 'RAM size of the target host.'
-    - string:
-        name: KEEP_TEST_ENV
-        default: 'true'
-        description: 'Whether tester VM and test env should be deleted or not by the end of the test'
-
-    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: '.*?/keep-test-{image_os}-integration-{capm3_target_branch}.*?'
-        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: "{target_branches}"
-        status-context: "keep-test-{image_os}-integration-{capm3_target_branch}"
-        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
index edd1133baf6a789c2c1fafa2be2001158dd2c447..8402afacd7b0cb6af2b6df2296382c0d458236b5 100644 (file)
         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:
+    - release-1-7:
         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'
-    jobs:
-    - integration_tests
-
-- project:
-    name: keep-integration-tests-alive
-    org: metal3-io
-    proj:
-    - metal3_dev_env:
-        repo: metal3-dev-env
-    - project_infra:
-        repo: project-infra
-        branch: '${{ghprbActualCommit}}'
-        ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - capm3:
-        repo: cluster-api-provider-metal3
-    - bmo:
-        repo: baremetal-operator
-    - ipam:
-        repo: ip-address-manager
-    - ironic_image:
-        repo: ironic-image
-    image_os:
-    - ubuntu
-    - centos
-    capm3_target_branch:
-    - main:
-        capi_version: v1beta1
-        capm3_version: v1beta1
-        capm3_release_branch: main
-        bmo_release_branch: main
+        capm3_release_branch: release-1.7
+        bmo_release_branch: release-0.6
         target_branches:
         - 'main'
+        - 'release-1.7'
+        - 'release-0.6'
     - 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'
-    jobs:
-    - keep_integration_tests
-
-- project:
-    name: metal3-dev-env-main-tests
-    org: metal3-io
-    repo: metal3-dev-env
-    image_os:
-    - ubuntu
-    - centos
-    jobs:
-    - capm3_periodic_integration_tests:
-        capm3_target_branch:
-        - main:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: main
-            bmo_release_branch: main
-            schedule: "H 4 * * *"
-        - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            schedule: "30 4 * * *"
-        - release-1-5:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.5
-            bmo_release_branch: release-0.4
-            schedule: "30 4 * * *"
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            schedule: "30 4 * * *"
-
-- project:
-    name: bml-tests
-    org: metal3-io
-    image_os: centos
-    jobs:
-    - bml_integration_tests:
-        proj:
-        - metal3_dev_env:
-            repo: metal3-dev-env
-        - project_infra:
-            repo: project-infra
-            branch: '${{ghprbActualCommit}}'
-            ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bml_periodic_integration_tests:
-        repo: metal3-dev-env
-
-- project:
-    name: 'project_infra_cleanup'
-    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
-    jobs:
-    - periodic_clean
-
-- project:
-    name: 'project_infra'
-    repo:
-      org: "metal3-io"
-      name: "project-infra"
-    jobs:
-    - fullstack_project-infra_building_test
-
-- project:
-    name: "capm3"
-    org: metal3-io
-    proj:
-    - capm3:
-        repo: cluster-api-provider-metal3
-    - metal3_dev_env:
-        repo: metal3-dev-env
-    - project_infra:
-        repo: project-infra
-        branch: '${{ghprbActualCommit}}'
-        ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bmo:
-        repo: baremetal-operator
-    - ipam:
-        repo: ip-address-manager
-    image_os:
-    - ubuntu
-    - centos
-    jobs:
-    - capm3_e2e_k8s_upgrade_tests:
-        k8s_versions:
-        - 1-28-1-29:
-            k8s_version_upgrade_from: v1.28.1
-            k8s_version_upgrade_to: v1.29.0
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-            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
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # 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
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # 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
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # 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
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # 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
-            k8s_version_upgrade_to: v1.27.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_e2e_integration_tests:
-        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:
-        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'
-    - capm3_clusterctl_upgrade_tests:
-        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
-    - keep_capm3_e2e_integration_tests:
-        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'
-    - keep_capm3_e2e_basic_tests:
-        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'
-    - keep_capm3_e2e_feature_tests:
-        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'
-    - keep_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
-    - keep_capm3_e2e_k8s_upgrade_tests:
-        k8s_versions:
-        - 1-28-1-29:
-            k8s_version_upgrade_from: v1.28.1
-            k8s_version_upgrade_to: v1.29.0
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-            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
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # 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
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # 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
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # 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
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # 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
-            k8s_version_upgrade_to: v1.27.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
+        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'
+    jobs:
+    - integration_tests
 
 - project:
-    name: "capm3-prow"
+    name: metal3-dev-env-main-tests
+    org: metal3-io
+    repo: metal3-dev-env
     image_os:
     - ubuntu
     - centos
     jobs:
-    - capm3_e2e_integration_tests_prow:
+    - capm3_periodic_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
+            schedule: "H 4 * * *"
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            schedule: "30 4 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
+            schedule: "30 4 * * *"
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-    - capm3_periodic_e2e_integration_tests_prow:
+            schedule: "30 4 * * *"
+
+- project:
+    name: bml-tests
+    org: metal3-io
+    image_os: centos
+    jobs:
+    - bml_integration_tests:
+        proj:
+        - metal3_dev_env:
+            repo: metal3-dev-env
+        - project_infra:
+            repo: project-infra
+            branch: '${{ghprbActualCommit}}'
+            ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+    - bml_periodic_integration_tests:
+        repo: metal3-dev-env
+
+- project:
+    name: 'project_infra_cleanup'
+    ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
+    jobs:
+    - periodic_clean
+
+- project:
+    name: 'project_infra'
+    repo:
+      org: "metal3-io"
+      name: "project-infra"
+    jobs:
+    - fullstack_project-infra_building_test
+
+- project:
+    name: "capm3-prow"
+    image_os:
+    - ubuntu
+    - centos
+    jobs:
+    - capm3_e2e_integration_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            schedule: "H 4 * * *"
-        - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            schedule: "30 4 * * *"
-    - keep_capm3_e2e_integration_tests_prow:
-        capm3_target_branch:
-        - main:
+        - release-1-7:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_release_branch: main
-            bmo_release_branch: main
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-    - capm3_e2e_feature_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
+            schedule: "H 4 * * *"
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            schedule: "30 4 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-        - release-1-5:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.5
-            bmo_release_branch: release-0.4
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-    - capm3_periodic_e2e_feature_tests_prow:
+            schedule: "30 4 * * *"
+    - capm3_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            schedule: "H 2 * * *"
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             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_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            schedule: "H 11 * * *"
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            schedule: "H 5 * * *"
-    - keep_capm3_e2e_feature_tests_prow:
+    - capm3_periodic_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
+            schedule: "H 2 * * *"
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            schedule: "H 2 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             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_release_branch: release-1.5
             bmo_release_branch: release-0.4
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
+            schedule: "H 11 * * *"
     - capm3_e2e_clusterctl_upgrade_tests_prow:
         capm3_target_branch:
         - main:
             capm3_release_branch: main
             bmo_release_branch: main
+        - release-1-7:
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - 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_e2e_k8s_upgrade_tests_prow:
             capm3_release_branch: main
             capm3_target_branch: main
             bmo_release_branch: main
+        - 1-28-1-29:
+            k8s_version_upgrade_from: v1.28.1
+            k8s_version_upgrade_to: v1.29.0
+            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            capm3_target_branch: release-1-4
         exclude:
         - image_os: centos
     - capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
         - main:
             capm3_release_branch: main
             bmo_release_branch: main
+        - release-1-7:
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - 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_periodic_e2e_k8s_upgrade_tests_prow:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
             kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            capm3_target_branch: release-1-6
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-            capm3_release_branch: release-1.5
-            bmo_release_branch: release-0.4
-            capm3_target_branch: release-1-5
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            capm3_target_branch: release-1-4
-        exclude:
-        - image_os: centos
-    - keep_capm3_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
-    - keep_capm3_e2e_k8s_upgrade_tests_prow:
-        k8s_versions:
-        - 1-28-1-29:
-            k8s_version_upgrade_from: v1.28.1
-            k8s_version_upgrade_to: v1.29.0
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-            capm3_release_branch: main
-            bmo_release_branch: main
-            capm3_target_branch: main
-        - 1-27-1-28:
-            k8s_version_upgrade_from: v1.27.4
-            k8s_version_upgrade_to: v1.28.1
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-            capm3_release_branch: main
-            bmo_release_branch: main
-            capm3_target_branch: main
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-            capm3_release_branch: main
-            bmo_release_branch: main
-            capm3_target_branch: main
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            capm3_target_branch: release-1-4
         exclude:
         - image_os: centos
-
 - project:
     name: "capm3-periodic-tests"
     repo:
     - capm3_periodic_e2e_ephemeral_tests:
         exclude:
         - image_os: ubuntu
-    - capm3_periodic_e2e_integration_tests:
-        capm3_target_branch:
-        - main:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: main
-            bmo_release_branch: main
-            schedule: "H 4 * * *"
-        - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            schedule: "30 4 * * *"
 
 - project:
     name: 'ironic_image_build_tests'
     ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
-- project:
-    name: dev-env-integration-tests
-    org: metal3-io
-    proj:
-    - metal3_dev_env:
-        repo: metal3-dev-env
-    - project_infra:
-        repo: project-infra
-        branch: '${{ghprbActualCommit}}'
-        ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - capm3:
-        repo: cluster-api-provider-metal3
-    - bmo:
-        repo: baremetal-operator
-    - ipam:
-        repo: ip-address-manager
-    - ironic_image:
-        repo: ironic-image
-        name_postfix: '_ironic_from_source'
-        trigger_postfix: '-ironic-source'
-        ironic_install_type: 'source'
-    - ironic_ipa_downloader:
-        repo: ironic-ipa-downloader
-    - mariadb_image:
-        repo: mariadb-image
-        build_mariadb_image_locally: 'true'
-        ironic_use_mariadb: 'true'
-    image_os:
-    - ubuntu
-    - centos
-    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'
-    jobs:
-    - dev_env_integration_tests
-
 - project:
     name: dev-env-integration-tests-prow
     org: metal3-io
             bmo_release_branch: main
             target_branches:
             - 'main'
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            target_branches:
+            - 'main'
+            - 'release-1.7'
+            - 'release-0.6'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             - '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'
     - dev_env_periodic_integration_tests_prow:
         capm3_target_branch:
         - main:
index 7542a1ccdc05c653576d332d420eedd4bf370e30..01647e0c8a84fee13ad2306836a8f98a4460fe8e 100644 (file)
@@ -24,7 +24,7 @@
     name: cps-performance-test
     project: cps
     project-name: cps
-    timer: "15 2 * * *"
+    timer: "0 */2 * * *"
     mvn_params: "-P include-performance"
 
     stream: