Merge "Migrate ephemeral test to prow"
diff --git a/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
index 632883e..3b660fe 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_ephemeral_tests.yml
@@ -26,53 +26,60 @@
- job-template:
id: capm3_periodic_e2e_ephemeral_tests
- name: '{job_prefix}_periodic_e2e_ephemeral_test_{image_os}'
- description: "CAPM3 v1beta1 e2e tests in ephemeral cluster for {repo[org]}/{repo[name]} on centos."
+ name: '{job_prefix}-periodic-{image_os}-e2e-ephemeral-test-{capm3_target_branch}'
+ description: "CAPM3 v1beta1 e2e tests in ephemeral cluster on centos."
project-type: pipeline
defaults: global
disabled: False
concurrent: True
parameters:
+ # Parameters set by Prow
- string:
- name: PROJECT_REPO_ORG
- default: '{repo[org]}'
+ name: BUILD_ID
+ description: 'Used by Prow when triggering jobs'
+ - string:
+ name: PROW_JOB_ID
+ description: 'Used by Prow when triggering jobs'
+ - string:
+ name: REPO_OWNER
+ default: 'metal3-io'
description: 'Project github repo org name'
- string:
- name: PROJECT_REPO_NAME
- default: '{repo[name]}'
+ name: REPO_NAME
+ default: 'cluster-api-provider-metal3'
description: 'Project github repo name'
- string:
- name: ghprbActualCommit
- default: 'main'
- description: 'CI Repo branch for triggering manual build'
+ name: PULL_BASE_REF
+ default: '{capm3_release_branch}'
+ description: 'Ref name of the base branch'
- string:
- name: ghprbAuthorRepoGitUrl
- default: 'https://github.com/{repo[org]}/{repo[name]}.git'
- description: 'CI Repo URL for triggering manual build'
+ name: PULL_PULL_SHA
+ default: '{capm3_release_branch}'
+ description: 'Pull request head SHA'
- string:
- name: ghprbTargetBranch
- default: 'main'
- description: 'Target branch of the PR'
+ name: PULL_NUMBER
+ description: 'Pull request number'
+ # End of Prow parameters
- 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'
+ default: '{capm3_release_branch}'
description: 'The target branch of CAPM3 to be used for this test'
- string:
name: bmo_release_branch
- default: 'main'
+ default: '{bmo_release_branch}'
description: 'The target branch of BMO to be used for this test'
- string:
name: CAPI_VERSION
- default: 'v1beta1'
- description: 'Cluster API version. E.g. v1beta1.'
+ default: '{capi_version}'
+ description: 'Cluster API version.'
- string:
name: CAPM3_VERSION
- default: 'v1beta1'
- description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
+ default: '{capm3_version}'
+ description: 'Cluster API provider Metal3 version.'
- string:
name: TARGET_NODE_MEMORY
default: 4096
@@ -112,5 +119,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{ci_github_pipeline}"
+ script-path: "jenkins/jobs/prow_integration_tests.pipeline"
lightweight-checkout: False
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 0ee4789..f8cc38b 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -417,16 +417,13 @@
capm3_target_branch: release-1-5
exclude:
- image_os: centos
-- project:
- name: "capm3-periodic-tests"
- repo:
- org: "metal3-io"
- name: "cluster-api-provider-metal3"
- image_os:
- - ubuntu
- - centos
- jobs:
- capm3_periodic_e2e_ephemeral_tests:
+ capm3_target_branch:
+ - main:
+ capi_version: v1beta1
+ capm3_version: v1beta1
+ capm3_release_branch: main
+ bmo_release_branch: main
exclude:
- image_os: ubuntu