Use parrallel e2e for e2e features test

Change-Id: I6cbf3bb7dad2b812abb2dd194fe41f6b834d811c

diff --git a/jjb/metal3/job_capm3_e2e_tests_parallel.yml b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
new file mode 100644 (file)
index 0000000..5957d22
--- /dev/null
+++ b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
@@ -0,0 +1,119 @@
+---
+#
+# ============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_tests_parallel
+    name: '{job_prefix}_{proj}_{version}_e2e_test_{image_os}_parallel'
+    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: 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.'
+
+    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-{version}-{image_os}-e2e-parallel(\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: "{target_branches}"
+        status-context: "test-{version}-{image_os}-e2e"
+        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: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
+      lightweight-checkout: False

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index bbb62891b01163936d55382aec1dba5c2db7ff68..e44605cabb16c9fb397be25cc1e710bc770e1412 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -236,34 +236,27 @@
     image_os:
       - ubuntu
       - centos
+    version:
+      - v1b1:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          target_branches:
+            - 'main'
+      - v1a5:
+          capi_version: v1alpha4
+          capm3_version: v1alpha5
+          target_branches:
+            - 'release-0.5'
     jobs:
       - capm3_e2e_upgrade_tests:
           exclude:
             - image_os: centos
+            - version:
+              - v1b1
+              - v1a5
+      - capm3_e2e_tests_parallel:
       - capm3_e2e_tests:
-          version:
-            - v1b1:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                target_branches:
-                  - 'main'
-            - v1a5:
-                capi_version: v1alpha4
-                capm3_version: v1alpha5
-                target_branches:
-                  - 'release-0.5'
       - keep_capm3_e2e_tests:
-          version:
-            - v1b1:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                target_branches:
-                  - 'main'
-            - v1a5:
-                capi_version: v1alpha4
-                capm3_version: v1alpha5
-                target_branches:
-                  - 'release-0.5'
 
 - project:
     name: "capm3-main-tests"