Merge "Use python3.6 for engine lint jobs"
diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml
index 1df2120..84353fd 100644
--- a/jjb/airship/defaults.yml
+++ b/jjb/airship/defaults.yml
@@ -31,11 +31,6 @@
ci_github_whitelist_org:
- metal3-io
- nordix-airship
- jobs:
- - capi_bm_integration_tests_ubuntu
- - capi_bm_integration_tests_centos
- - capi_bm_v1a2_integration_tests_centos
- - capi_bm_v1a2_integration_tests_ubuntu
ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
ci_github_jenkins_credentials_id: 'metal3-jenkins-github-token'
diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index e9f8678..77c3283 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -52,6 +52,11 @@
org: "metal3-io"
name: "project-infra"
ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_ubuntu
- project:
@@ -59,6 +64,11 @@
repo:
org: "metal3-io"
name: "baremetal-operator"
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_ubuntu
- project:
@@ -81,21 +91,41 @@
repo:
org: "metal3-io"
name: "cluster-api-provider-baremetal"
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_ubuntu
- project:
name: "metal3io_ironic_image"
repo:
org: "metal3-io"
name: "ironic-image"
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_ubuntu
- project:
name: "metal3io_ironic_inspector"
repo:
org: "metal3-io"
name: "ironic-inspector-image"
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_ubuntu
- project:
name: "metal3io_ironic_ipa_downloader"
repo:
org: "metal3-io"
name: "ironic-ipa-downloader"
+ jobs:
+ - capi_bm_integration_tests_ubuntu
+ - capi_bm_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_centos
+ - capi_bm_v1a2_integration_tests_ubuntu