Add daily e2e intergation tests and the keep tests and fix feature test naming 54/17454/9
authorMohammed Boukhalfa <mohammed.boukhalfa@est.tech>
Fri, 3 Mar 2023 18:29:09 +0000 (20:29 +0200)
committerMohammed Boukhalfa <mohammed.boukhalfa@est.tech>
Tue, 7 Mar 2023 12:23:04 +0000 (14:23 +0200)
Change-Id: I97515f528e87012e627852b3d86277b63bab9cb0

jjb/metal3/job_capm3_e2e_feature_tests.yml [moved from jjb/metal3/job_capm3_e2e_tests.yml with 93% similarity]
jjb/metal3/job_capm3_e2e_integration_tests.yml
jjb/metal3/job_capm3_e2e_upgrade_tests.yml
jjb/metal3/job_capm3_main_e2e_feature_tests.yml [moved from jjb/metal3/job_capm3_main_e2e_tests.yml with 97% similarity]
jjb/metal3/job_capm3_main_e2e_integration_tests.yml [new file with mode: 0644]
jjb/metal3/job_keep_capm3_e2e_feature_tests.yml [moved from jjb/metal3/job_keep_capm3_e2e_tests.yml with 93% similarity]
jjb/metal3/job_keep_capm3_e2e_integration_tests.yml [new file with mode: 0644]
jjb/metal3/job_keep_capm3_e2e_upgrade_tests.yml
jjb/metal3/job_parallel_capm3_e2e_tests.yml [moved from jjb/metal3/job_capm3_e2e_tests_parallel.yml with 92% similarity]
jjb/metal3/projects.yml

similarity index 93%
rename from jjb/metal3/job_capm3_e2e_tests.yml
rename to jjb/metal3/job_capm3_e2e_feature_tests.yml
index b169e3c79834c73afe9c67c9b18bf9e4406ce156..c567efe1240928be2c265023c927427bfa0501a1 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_e2e_tests
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_e2e_test_{image_os}'
+    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
@@ -98,7 +98,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "test-{image_os}-e2e-{capm3_target_branch}"
+        status-context: "test-{image_os}-e2e-feature-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
index ea70edef82e47b442a2a100cd19d507d48bf0ef7..adf4cedfba2350c9d443d2aaa49385414ecf5cc7 100644 (file)
@@ -98,7 +98,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-integration-e2e-main(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-integration-main(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'main'
-        status-context: "test-{image_os}-integration-e2e-main"
+        status-context: "test-{image_os}-e2e-integration-main"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
index dc28bca5128bf7653a369b06150532ff8e7d1bb6..a0e2c3af3b9fd5d4796fdf5fea165a0e7f03be13 100644 (file)
@@ -98,7 +98,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-upgrade-e2e-main(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-e2e-upgrade-main(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'main'
-        status-context: "test-upgrade-e2e-main"
+        status-context: "test-e2e-upgrade-main"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
similarity index 97%
rename from jjb/metal3/job_capm3_main_e2e_tests.yml
rename to jjb/metal3/job_capm3_main_e2e_feature_tests.yml
index ed9f09d2bfd3a1b0bbc304d45a02220da5bace3e..bcfdf5c28ebb83de2511f10d667680e95b4c96a3 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_tests
-    name: '{job_prefix}_daily_{capm3_target_branch}_e2e_test_{image_os}'
+    id: capm3_main_e2e_feature_tests
+    name: '{job_prefix}_daily_{capm3_target_branch}_e2e_feature_test_{image_os}'
     description: "CAPM3 {capm3_version} e2e tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global
diff --git a/jjb/metal3/job_capm3_main_e2e_integration_tests.yml b/jjb/metal3/job_capm3_main_e2e_integration_tests.yml
new file mode 100644 (file)
index 0000000..b358892
--- /dev/null
@@ -0,0 +1,108 @@
+---
+#
+# ============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_main_e2e_integration_tests
+    name: '{job_prefix}_daily_main_e2e_integration_test_{image_os}'
+    description: "CAPM3 main 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: '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: "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
similarity index 93%
rename from jjb/metal3/job_keep_capm3_e2e_tests.yml
rename to jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
index 5d80035ab44bfe62faefb7c32e3bcb9b0dda3dfa..ad41f864f80510026e9f776064ab72e705f48046 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: keep_capm3_e2e_tests
-    name: '{job_prefix}_keep_{proj}_{capm3_target_branch}_e2e_test_{image_os}'
+    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
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "keep-test-{image_os}-e2e-{capm3_target_branch}"
+        status-context: "keep-test-{image_os}-e2e-feature-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
diff --git a/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml b/jjb/metal3/job_keep_capm3_e2e_integration_tests.yml
new file mode 100644 (file)
index 0000000..ffd161c
--- /dev/null
@@ -0,0 +1,132 @@
+---
+#
+# ============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: 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: SKIP_DELETION
+        default: 'true'
+        description: 'Whether tester VM 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: '((.|\n)*\s)?/keep-test-{image_os}-e2e-integration-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-{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
index 91b428172ec1997f26dde3b9969080853389984b..98f29207562b3dec7841ce7708e286ca6b1ec902 100644 (file)
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-upgrade-e2e-main(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/keep-test-e2e-upgrade-main(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'main'
-        status-context: "keep-test-upgrade-e2e-main"
+        status-context: "keep-test-e2e-upgrade-main"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
similarity index 92%
rename from jjb/metal3/job_capm3_e2e_tests_parallel.yml
rename to jjb/metal3/job_parallel_capm3_e2e_tests.yml
index 2a41d05cce5c565cb4226c3c143819d72e460931..6563d9f6442874a5430836782c735b680430e45e 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capm3_e2e_tests_parallel
-    name: '{job_prefix}_{proj}_{capm3_target_branch}_e2e_test_{image_os}_parallel'
+    id: parallel_capm3_e2e_feature_tests
+    name: '{job_prefix}_parallel_{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
@@ -94,7 +94,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-parallel-{capm3_target_branch}(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/parallel-test-{image_os}-e2e-feature-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "test-{image_os}-e2e-parallel-{capm3_target_branch}"
+        status-context: "parallel-test-{image_os}-e2e-feature-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
index 34ffacdf46f93addb74677b07ec95d08442a3568..e9cfdddd1d553f11508ea88e05743f2b9089afb2 100644 (file)
           exclude:
             - image_os: centos
       - capm3_e2e_integration_tests:
-      - capm3_e2e_tests_parallel:
-      - capm3_e2e_tests:
-      - keep_capm3_e2e_tests:
+      - parallel_capm3_e2e_feature_tests:
+      - capm3_e2e_feature_tests:
+      - keep_capm3_e2e_integration_tests:
+      - keep_capm3_e2e_feature_tests:
       - keep_capm3_e2e_upgrade_tests:
           exclude:
             - image_os: centos
       - capm3_main_e2e_ephemeral_tests:
           exclude:
             - image_os: ubuntu
-      - capm3_main_e2e_tests:
+      - capm3_main_e2e_integration_tests:
+      - capm3_main_e2e_feature_tests:
           capm3_target_branch:
             - main:
                 capi_version: v1beta1