Remove ghprb and add prow pareameters in bml jobs
Change-Id: I4e6029ec5c5ff10197c7b2d8fb1ba8f810e4d033
Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>
diff --git a/jjb/metal3/job_bml_integration_tests.yml b/jjb/metal3/job_bml_integration_tests.yml
index 72c3c40..24627af 100644
--- a/jjb/metal3/job_bml_integration_tests.yml
+++ b/jjb/metal3/job_bml_integration_tests.yml
@@ -27,33 +27,40 @@
- job-template:
id: bml_integration_tests
- name: '{job_prefix}_{proj}_bml_integration_tests_{image_os}'
- description: "CAPM3 v1beta1 integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
+ name: '{job_prefix}-bml-integration-tests-{image_os}'
+ description: "CAPM3 v1beta1 integration tests on {image_os} in Bare Metal Lab."
project-type: pipeline
defaults: global
disabled: False
concurrent: True
parameters:
+ # Parameters set by Prow
- string:
- name: PROJECT_REPO_ORG
- default: '{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: REPO_NAME
+ default: 'metal3-dev-env'
description: 'Project github repo name'
- string:
- name: ghprbActualCommit
+ name: PULL_BASE_REF
default: 'main'
- description: 'CI Repo branch for triggering manual build'
+ description: 'Ref name of the base branch'
- string:
- name: ghprbAuthorRepoGitUrl
- default: 'https://github.com/{org}/{repo}.git'
- description: 'CI Repo URL for triggering manual build'
- - string:
- name: ghprbTargetBranch
+ name: PULL_PULL_SHA
default: 'main'
- description: 'Target branch of the PR'
+ description: 'Pull request head SHA'
+ - string:
+ name: PULL_NUMBER
+ description: 'Pull request number'
+ # End of Prow parameters
- string:
name: IMAGE_OS
default: '{image_os}'
@@ -69,11 +76,11 @@
- string:
name: CAPI_VERSION
default: 'v1beta1'
- description: 'Cluster API version.'
+ description: 'Cluster API version. E.g. v1beta1.'
- string:
name: CAPM3_VERSION
default: 'v1beta1'
- description: 'Cluster API provider Metal3 version.'
+ description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
- string:
name: TARGET_NODE_MEMORY
default: 4096
@@ -81,7 +88,7 @@
- string:
name: NUM_NODES
default: 2
- description: 'Number of baremetal servers.'
+ description: 'Number of baremetal servers'
properties:
- build-discarder:
@@ -89,36 +96,12 @@
num-to-keep: 300
artifact-days-to-keep: -1
artifact-num-to-keep: -1
- - github:
- url: https://github.com/{org}/{repo}
- build-blocker:
use-build-blocker: true
blocking-jobs:
- ".*_bml_integration_tests_centos"
block-level: 'GLOBAL'
- 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: '.*?/test-integration-bml-{image_os}.*?'
- 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:
- - 'master'
- - 'main'
- status-context: "test-integration-bml-{image_os}"
- success-status: "Passed"
- failure-status: "Failed"
- error-status: "Error"
- cancel-builds-on-update: True
pipeline-scm:
scm:
- git:
diff --git a/jjb/metal3/job_bml_periodic_integration_tests.yml b/jjb/metal3/job_bml_periodic_integration_tests.yml
index 667a326..dd36602 100644
--- a/jjb/metal3/job_bml_periodic_integration_tests.yml
+++ b/jjb/metal3/job_bml_periodic_integration_tests.yml
@@ -27,33 +27,40 @@
- job-template:
id: bml_periodic_integration_tests
- name: '{job_prefix}_periodic_bml_integration_tests_{image_os}'
- description: "CAPM3 v1beta1 main integration tests for {org}/{repo} on {image_os} in Bare Metal Lab."
+ name: '{job_prefix}-periodic-bml-integration_tests-{image_os}'
+ description: "CAPM3 v1beta1 periodic integration tests on {image_os} in Bare Metal Lab."
project-type: pipeline
defaults: global
disabled: False
concurrent: True
parameters:
+ # Parameters set by Prow
- string:
- name: PROJECT_REPO_ORG
- default: '{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: REPO_NAME
+ default: 'metal3-dev-env'
description: 'Project github repo name'
- string:
- name: ghprbActualCommit
+ name: PULL_BASE_REF
default: 'main'
- description: 'CI Repo branch for triggering manual build'
+ description: 'Ref name of the base branch'
- string:
- name: ghprbAuthorRepoGitUrl
- default: 'https://github.com/{org}/{repo}.git'
- description: 'CI Repo URL for triggering manual build'
- - string:
- name: ghprbTargetBranch
+ name: PULL_PULL_SHA
default: 'main'
- description: 'Target branch of the PR'
+ description: 'Pull request head SHA'
+ - string:
+ name: PULL_NUMBER
+ description: 'Pull request number'
+ # End of Prow parameters
- string:
name: IMAGE_OS
default: '{image_os}'
@@ -69,11 +76,11 @@
- string:
name: CAPI_VERSION
default: 'v1beta1'
- description: 'Cluster API version.'
+ description: 'Cluster API version. E.g. v1beta1.'
- string:
name: CAPM3_VERSION
default: 'v1beta1'
- description: 'Cluster API provider Metal3 version.'
+ description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
- string:
name: TARGET_NODE_MEMORY
default: 4096
@@ -81,7 +88,7 @@
- string:
name: NUM_NODES
default: 2
- description: 'Number of baremetal servers.'
+ description: 'Number of baremetal servers'
properties:
- build-discarder:
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 7dcbae6..1dda523 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -56,16 +56,8 @@
org: metal3-io
image_os: centos
jobs:
- - bml_integration_tests:
- proj:
- - metal3_dev_env:
- repo: metal3-dev-env
- - project_infra:
- repo: project-infra
- branch: '${{ghprbActualCommit}}'
- ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
- - bml_periodic_integration_tests:
- repo: metal3-dev-env
+ - bml_integration_tests
+ - bml_periodic_integration_tests
- project:
name: 'project_infra_cleanup'