Merge "Add(separate) e2e k8s upgrade tests"
diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index ca138c7..a423fa3 100644
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -33,6 +33,7 @@
- nordix-metal3
ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
+ e2e_feature_test_parallel_pipeline: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c'
- defaults:
diff --git a/jjb/metal3/job_capm3_e2e_feature_tests.yml b/jjb/metal3/job_capm3_e2e_feature_tests.yml
index 5f132c4..72611cf 100644
--- a/jjb/metal3/job_capm3_e2e_feature_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_tests.yml
@@ -123,5 +123,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{ci_github_pipeline}"
+ script-path: "{e2e_feature_test_parallel_pipeline}"
lightweight-checkout: False
diff --git a/jjb/metal3/job_capm3_main_e2e_feature_tests.yml b/jjb/metal3/job_capm3_main_e2e_feature_tests.yml
index b702250..fe183b1 100644
--- a/jjb/metal3/job_capm3_main_e2e_feature_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_feature_tests.yml
@@ -108,5 +108,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{ci_github_pipeline}"
+ script-path: "{e2e_feature_test_parallel_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
index dd27fdb..8a8d8c7 100644
--- a/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_feature_tests.yml
@@ -85,7 +85,6 @@
name: GINKGO_FOCUS
default: "features"
description: 'Select the e2e integration test'
-
properties:
- build-discarder:
days-to-keep: 30
@@ -127,5 +126,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{ci_github_pipeline}"
+ script-path: "{e2e_feature_test_parallel_pipeline}"
lightweight-checkout: False
diff --git a/jjb/metal3/job_parallel_capm3_e2e_tests.yml b/jjb/metal3/job_parallel_capm3_e2e_tests.yml
deleted file mode 100644
index 6563d9f..0000000
--- a/jjb/metal3/job_parallel_capm3_e2e_tests.yml
+++ /dev/null
@@ -1,123 +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: 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
- 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: 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)?/parallel-test-{image_os}-e2e-feature-{capm3_target_branch}(\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: "parallel-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: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
- lightweight-checkout: False
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 2b2a769..392cc78 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -323,7 +323,6 @@
target_branches:
- 'main'
- 'release-1.4'
- - parallel_capm3_e2e_feature_tests:
- capm3_e2e_feature_tests:
- keep_capm3_e2e_integration_tests:
capm3_target_branch: