Run feature tests independently
Signed-off-by: smoshiur1237 <moshiur.rahman@est.tech>
Change-Id: I37b0e9cf78c35f65000e58ea3a6171079daf8d27
diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index 96cd585..86eed6d 100644
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -34,7 +34,7 @@
ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
- e2e_feature_test_parallel_pipeline: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
+ e2e_feature_test_pipeline: 'jenkins/jobs/e2e_features_test.pipeline'
e2e_tests_pipeline: 'jenkins/jobs/capm3-e2e-tests.pipeline'
dev_env_integration_test_pipeline: 'jenkins/jobs/dev_env_integration_tests.pipeline'
image_building_pipeline: 'jenkins/jobs/image_building.pipeline'
diff --git a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
index 963835d..24d79c3 100644
--- a/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_feature_tests_prow.yml
@@ -26,7 +26,7 @@
- job-template:
id: capm3_e2e_feature_tests_prow
- name: '{job_prefix}-{image_os}-e2e-feature-test-{capm3_target_branch}'
+ name: '{job_prefix}-{image_os}-e2e-feature-test-{capm3_target_job}'
description: "CAPM3 {capm3_version} e2e tests on {image_os}."
project-type: pipeline
defaults: global
@@ -90,8 +90,8 @@
description: 'Number of libvirt VMs.'
- string:
name: GINKGO_FOCUS
- default: "features"
- description: 'Select the e2e integration test'
+ default: '{ginkgo_focus}'
+ description: 'Select the e2e feature test'
properties:
- build-discarder:
@@ -114,5 +114,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{e2e_feature_test_parallel_pipeline}"
+ script-path: "{e2e_feature_test_pipeline}"
lightweight-checkout: False
diff --git a/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
index a7c3eac..7a12089 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_feature_tests _prow.yml
@@ -26,7 +26,7 @@
- job-template:
id: capm3_periodic_e2e_feature_tests_prow
- name: '{job_prefix}-periodic-{image_os}-e2e-feature-test-{capm3_target_branch}'
+ name: '{job_prefix}-periodic-{image_os}-e2e-feature-test-{capm3_target_job}'
description: "CAPM3 {capm3_version} e2e tests on {image_os}."
project-type: pipeline
defaults: global
@@ -90,8 +90,8 @@
description: 'Number of libvirt VMs.'
- string:
name: GINKGO_FOCUS
- default: "features"
- description: 'Select the e2e integration test'
+ default: '{ginkgo_focus}'
+ description: 'Select the e2e feature test'
properties:
- build-discarder:
@@ -115,5 +115,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{e2e_feature_test_parallel_pipeline}"
+ script-path: "{e2e_feature_test_pipeline}"
lightweight-checkout: False
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b750a80..acc8267 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -123,53 +123,189 @@
bmo_release_branch: release-0.5
schedule: "30 1 * * *"
- capm3_e2e_feature_tests_prow:
- capm3_target_branch:
- - main:
+ capm3_target_job:
+ - main-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: main
bmo_release_branch: main
- - release-1-7:
+ capm3_target_branch: main
+ ginkgo_focus: pivoting
+ - main-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: remediation
+ - main-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: features
+ - release-1-7-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
- - release-1-6:
+ capm3_target_branch: release-1-7
+ ginkgo_focus: pivoting
+ - release-1-7-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: remediation
+ - release-1-7-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: features
+ - release-1-6-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.6
bmo_release_branch: release-0.5
- - release-1-5:
+ capm3_target_branch: release-1-6
+ ginkgo_focus: pivoting
+ - release-1-6-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ capm3_target_branch: release-1-6
+ ginkgo_focus: remediation
+ - release-1-6-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ capm3_target_branch: release-1-6
+ ginkgo_focus: features
+ - release-1-5-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.5
bmo_release_branch: release-0.4
+ capm3_target_branch: release-1-5
+ ginkgo_focus: pivoting
+ - release-1-5-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ bmo_release_branch: release-0.4
+ capm3_target_branch: release-1-5
+ ginkgo_focus: remediation
+ - release-1-5-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ bmo_release_branch: release-0.4
+ capm3_target_branch: release-1-5
+ ginkgo_focus: features
- capm3_periodic_e2e_feature_tests_prow:
- capm3_target_branch:
- - main:
+ capm3_target_job:
+ - main-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: main
bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: pivoting
schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
- - release-1-7:
+ - main-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: remediation
+ schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+ - main-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
+ capm3_target_branch: main
+ ginkgo_focus: features
+ schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
+ - release-1-7-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
- schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
- - release-1-6:
+ capm3_target_branch: release-1-7
+ ginkgo_focus: pivoting
+ schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
+ - release-1-7-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: remediation
+ schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
+ - release-1-7-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.7
+ bmo_release_branch: release-0.6
+ capm3_target_branch: release-1-7
+ ginkgo_focus: features
+ schedule: "H 19 1-31/2 * *" # Runs on odd days 7 PM
+ - release-1-6-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.6
bmo_release_branch: release-0.5
- schedule: "H 5 2-30/2 * *" # Runs on even days 5 AM
- - release-1-5:
+ capm3_target_branch: release-1-6
+ ginkgo_focus: pivoting
+ schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+ - release-1-6-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ capm3_target_branch: release-1-6
+ ginkgo_focus: remediation
+ schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+ - release-1-6-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.6
+ bmo_release_branch: release-0.5
+ capm3_target_branch: release-1-6
+ ginkgo_focus: features
+ schedule: "H 0 2-30/2 * *" # Runs on even days 0 AM
+ - release-1-5-pivoting:
capi_version: v1beta1
capm3_version: v1beta1
capm3_release_branch: release-1.5
bmo_release_branch: release-0.4
- schedule: "H 10 2-30/2 * *" # Runs on even days 10 AM
+ capm3_target_branch: release-1-5
+ ginkgo_focus: pivoting
+ schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+ - release-1-5-remediation:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ bmo_release_branch: release-0.4
+ capm3_target_branch: release-1-5
+ ginkgo_focus: remediation
+ schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
+ - release-1-5-features:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: release-1.5
+ bmo_release_branch: release-0.4
+ capm3_target_branch: release-1-5
+ ginkgo_focus: features
+ schedule: "H 0 1-31/2 * *" # Runs on odd days 0 AM
exclude:
- image_os: ubuntu # This is to disable the tests running on ubuntu, to save resources
- capm3_e2e_clusterctl_upgrade_tests_prow: