From 3116ba56b47853ec94dabf0b6d5e745e4aec9163 Mon Sep 17 00:00:00 2001 From: maelk Date: Mon, 20 Jan 2020 11:25:52 +0200 Subject: [PATCH] Airship Parameterize the script path for e2e metal3 tests and add the project-infra jobs Change-Id: Ifac6229528098a03b74cf45e2db156ddb4666d0e --- jjb/airship/defaults.yml | 1 + jjb/airship/job_capi_bm_integration_tests_centos.yml | 2 +- jjb/airship/job_capi_bm_integration_tests_ubuntu.yml | 2 +- .../job_capi_bm_master_integration_tests_centos.yml | 4 ++-- .../job_capi_bm_master_integration_tests_ubuntu.yml | 4 ++-- .../job_capi_bm_v1a2_integration_tests_centos.yml | 2 +- .../job_capi_bm_v1a2_integration_tests_ubuntu.yml | 2 +- ..._capi_bm_v1a2_master_integration_tests_centos.yml | 4 ++-- ..._capi_bm_v1a2_master_integration_tests_ubuntu.yml | 4 ++-- jjb/airship/projects.yml | 12 ++++++++++++ 10 files changed, 25 insertions(+), 12 deletions(-) diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml index 292aee00b..f41a72fe0 100644 --- a/jjb/airship/defaults.yml +++ b/jjb/airship/defaults.yml @@ -33,3 +33,4 @@ ci_github_admin_user: 'nordixinfra' ci_github_whitelist_org: - nordix-airship + ci_github_pipeline: 'ci/jobs/capi_bm_integration_tests.pipeline' diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml index 4620926c0..b0cab355f 100644 --- a/jjb/airship/job_capi_bm_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml @@ -105,5 +105,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml index 02467b1d6..2b0f79a48 100644 --- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml @@ -105,5 +105,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml index 6776997c4..3211f0f0a 100644 --- a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_master_integration_tests_centos.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/Nordix/airship-dev-tools.git + url: https://github.com/{ci_github_repo}.git credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' @@ -88,5 +88,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml index 66ba8aef6..3a1356abf 100644 --- a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/Nordix/airship-dev-tools.git + url: https://github.com/{ci_github_repo}.git credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' @@ -88,5 +88,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml index 66dba3647..7a5cab016 100644 --- a/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_centos.yml @@ -105,5 +105,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml index 41837d315..2b7686759 100644 --- a/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a2_integration_tests_ubuntu.yml @@ -105,5 +105,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml index 3590a7915..966739959 100644 --- a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_centos.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/Nordix/airship-dev-tools.git + url: https://github.com/{ci_github_repo}.git credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' @@ -88,5 +88,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml index 787cc2438..d54e12543 100644 --- a/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a2_master_integration_tests_ubuntu.yml @@ -79,7 +79,7 @@ pipeline-scm: scm: - git: - url: https://github.com/Nordix/airship-dev-tools.git + url: https://github.com/{ci_github_repo}.git credentials-id: "{ci_github_jenkins_credentials_id}" branches: - '{branch|master}' @@ -88,5 +88,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' + script-path: "{ci_github_pipeline}" lightweight-checkout: False diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index a363dba06..55ebb82ee 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -39,6 +39,18 @@ org: "Nordix" name: "airship-dev-tools" +- project: + name: 'metal3io_project_infra' + branch: '${{ghprbActualCommit}}' + jobs: + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos + repo: + org: "metal3-io" + name: "project-infra" + ci_github_repo: 'metal3-io/project-infra' + ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline' + - project: name: "nordix_bmo" jobs: -- 2.25.1