Add(separate) e2e k8s upgrade tests 02/18002/18
authorSunnatillo <sunnat.samadov@est.tech>
Tue, 25 Apr 2023 06:21:55 +0000 (09:21 +0300)
committerSunnatillo <sunnat.samadov@est.tech>
Mon, 5 Jun 2023 08:40:27 +0000 (11:40 +0300)
Change-Id: Ic5617cf4152c82d017f0aa23bf3112ee6fc12571

jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml [moved from jjb/metal3/job_capm3_e2e_upgrade_tests.yml with 95% similarity]
jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml [new file with mode: 0644]
jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests.yml [moved from jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml with 95% similarity]
jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml [new file with mode: 0644]
jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml [moved from jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml with 96% similarity]
jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml [new file with mode: 0644]
jjb/metal3/projects.yml

similarity index 95%
rename from jjb/metal3/job_capm3_e2e_upgrade_tests.yml
rename to jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests.yml
index f4bd13272ff5a551d38118daf9bb9040224d003e..9edba6ce157ceb093d8cdc5632c10cb097fa304b 100644 (file)
 
 # Description:
 # ============
-# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e upgrade tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e clusterctl upgrade tests.
 # This job can be triggered manually or through a Github pull request. It creates a
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_e2e_upgrade_tests
-    name: '{job_prefix}_{proj}_{upgrade_from_release}_main_e2e_upgrade_test_{image_os}'
+    id: capm3_e2e_clusterctl_upgrade_tests
+    name: '{job_prefix}_{proj}_{upgrade_from_release}_main_e2e_clusterctl_upgrade_test_{image_os}'
     description: "CAPM3 e2e upgrade tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
@@ -79,7 +79,7 @@
         description: 'Tests using the e2e framework.'
     - string:
         name: GINKGO_FOCUS
-        default: "upgrade"
+        default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
     - string:
         name: UPGRADE_FROM_RELEASE
diff --git a/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_e2e_k8s_upgrade_tests.yml
new file mode 100644 (file)
index 0000000..7bc5fc8
--- /dev/null
@@ -0,0 +1,136 @@
+---
+#
+# ============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}_main_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: 'main'
+        description: 'The target branch of CAPM3 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'
+
+    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: '((.|\n)*\s)?/test-e2e-{k8s_versions}-upgrade-main(\s(.|\n)*)?'
+        skip-build-phrase: '/skip-test'
+        only-trigger-phrase: True
+        github-hooks: True
+        permit-all: False
+        auto-close-on-fail: False
+        allow-whitelist-orgs-as-admins: True
+        white-list-target-branches:
+          - 'main'
+        status-context: "test-e2e-{k8s_versions}-upgrade-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
similarity index 95%
rename from jjb/metal3/job_capm3_main_e2e_upgrade_tests.yml
rename to jjb/metal3/job_capm3_main_e2e_clusterctl_upgrade_tests.yml
index 27cc7da7f454b184d2a753035c742e15e8830479..50f2d5aa81d010a1c4906598b58038c07d26d8a3 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_main_e2e_upgrade_tests
-    name: '{job_prefix}_daily_{upgrade_from_release}_main_e2e_upgrade_test_{image_os}'
+    id: capm3_main_e2e_clusterctl_upgrade_tests
+    name: '{job_prefix}_daily_{upgrade_from_release}_main_e2e_clusterctl_upgrade_test_{image_os}'
     description: "CAPM3 v1alpha5 to v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on ubuntu."
     project-type: pipeline
     defaults: global
@@ -79,7 +79,7 @@
         description: 'Tests using the e2e framework.'
     - string:
         name: GINKGO_FOCUS
-        default: "upgrade"
+        default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
     - string:
         name: UPGRADE_FROM_RELEASE
diff --git a/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_capm3_main_e2e_k8s_upgrade_tests.yml
new file mode 100644 (file)
index 0000000..eb7c1e3
--- /dev/null
@@ -0,0 +1,116 @@
+---
+#
+# ============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) main e2e k8s upgrade tests.
+# This job can be triggered manually or periodically by the CI system. It creates a
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
+
+- job-template:
+    id: capm3_main_e2e_k8s_upgrade_tests
+    name: '{job_prefix}_daily_main_e2e_{k8s_versions}_upgrade_test_{image_os}'
+    description: "CAPM3 e2e k8s upgrade tests for {repo[org]}/{repo[name]} on ubuntu."
+    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: 'main'
+        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: '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: 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'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+    triggers:
+      - timed: "H 18 * * *"
+
+    pipeline-scm:
+      scm:
+      - git:
+          url: "{ci_github_repo}"
+          credentials-id: "{ci_github_jenkins_credentials_id}"
+          branches:
+            - '{branch|main}'
+          name: 'origin'
+          refspec: '+refs/heads/*:refs/remotes/origin/*'
+          wipe-workspace: True
+          honor-refspec: True
+          shallow-clone: False
+      script-path: "{ci_github_pipeline}"
+      lightweight-checkout: False
similarity index 96%
rename from jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml
rename to jjb/metal3/job_keep_capm3_e2e_clusterctl_upgrade_tests.yml
index 7232952847eb96fafb77ffd0fb89ae5478b4b508..de151c9ba516e2bf159b5f788c316d45a5c9cf24 100644 (file)
 
 # Description:
 # ============
-# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e upgrade tests.
+# 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_upgrade_tests
-    name: '{job_prefix}_keep_{proj}_{upgrade_from_release}_main_e2e_upgrade_test_{image_os}'
+    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
@@ -83,7 +83,7 @@
         description: 'Whether tester VM and test env should be deleted or not by the end of the test'
     - string:
         name: GINKGO_FOCUS
-        default: "upgrade"
+        default: "clusterctl-upgrade"
         description: 'Select the e2e upgrade test'
     - string:
         name: UPGRADE_FROM_RELEASE
diff --git a/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml b/jjb/metal3/job_keep_capm3_e2e_k8s_upgrade_tests.yml
new file mode 100644 (file)
index 0000000..c88c0a7
--- /dev/null
@@ -0,0 +1,140 @@
+---
+#
+# ============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}_main_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: 'main'
+        description: 'The target branch of CAPM3 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'
+
+    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: '((.|\n)*\s)?/keep-test-e2e-{k8s_versions}-upgrade-main(\s(.|\n)*)?'
+        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-{k8s_versions}-upgrade-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
index 94f6682c81477f8e53894891e6dfefba02c7e515..2b2a76986bae92ab7d31828bee91bc5becd5e0f2 100644 (file)
           target_branches:
             - 'release-1.2'
     jobs:
-      - capm3_e2e_upgrade_tests:
+      - capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
             - from-release-1-4:
                 upgrade_from: v1.4.
                 upgrade_from: v0.5.
           exclude:
             - image_os: centos
+      - capm3_e2e_k8s_upgrade_tests:
+          k8s_versions:
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.1
+          exclude:
+              - image_os: centos
       - capm3_e2e_integration_tests:
           capm3_target_branch:
             - main:
                   - 'main'
                   - 'release-1.4'
       - keep_capm3_e2e_feature_tests:
-      - keep_capm3_e2e_upgrade_tests:
+      - keep_capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
             - from-release-1-4:
                 upgrade_from: v1.4.
                 upgrade_from: v0.5.
           exclude:
             - image_os: centos
+      - keep_capm3_e2e_k8s_upgrade_tests:
+          k8s_versions:
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.1
+          exclude:
+            - image_os: centos
 
 - project:
     name: "capm3-main-tests"
       - ubuntu
       - centos
     jobs:
-      - capm3_main_e2e_upgrade_tests:
+      - capm3_main_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
             - from-release-1-4:
                 upgrade_from: v1.4.
                 upgrade_from: v0.5.
           exclude:
             - image_os: centos
+      - capm3_main_e2e_k8s_upgrade_tests:
+          k8s_versions:
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.1
+          exclude:
+              - image_os: centos
       - capm3_main_e2e_ephemeral_tests:
           exclude:
             - image_os: ubuntu