From 1a9e93538f8fa4967baffa6022527197d5f67159 Mon Sep 17 00:00:00 2001 From: maelk Date: Tue, 21 Jan 2020 12:49:35 +0200 Subject: [PATCH] Airship remove tests for nordix repos and change defaults Change-Id: I49b81617bc2dc644cdcab7b2c9bbb77402fcbe1f --- jjb/airship/defaults.yml | 14 +++-- jjb/airship/projects.yml | 129 +++------------------------------------ 2 files changed, 18 insertions(+), 125 deletions(-) diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml index 0466ac35..1df2120f 100644 --- a/jjb/airship/defaults.yml +++ b/jjb/airship/defaults.yml @@ -27,10 +27,16 @@ - defaults: name: global job_prefix: 'airship' - ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token' - ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2' - ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git' ci_github_admin_user: 'nordixinfra' ci_github_whitelist_org: + - metal3-io - nordix-airship - ci_github_pipeline: 'ci/jobs/capi_bm_integration_tests.pipeline' + 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' + ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index 256c74c1..e9f86787 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -29,103 +29,40 @@ - project: name: 'nordix_dev_tools' branch: '${{ghprbActualCommit}}' + ci_github_whitelist_org: + - nordix-airship jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - linter_tests - openstack_image_building - docker_image_building + - update_nordix_repos repo: org: "Nordix" name: "airship-dev-tools" + ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token' + ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2' + ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git' - project: name: 'metal3io_project_infra' branch: '${{ghprbActualCommit}}' - jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - - capi_bm_v1a2_integration_tests_ubuntu - - capi_bm_v1a2_integration_tests_centos + ci_github_whitelist_org: + - nordix-airship repo: org: "metal3-io" name: "project-infra" ci_github_repo: '${{ghprbAuthorRepoGitUrl}}' - ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline' - ci_github_jenkins_credentials_id: 'metal3-jenkins-github-token' - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - -- project: - name: "nordix_bmo" - jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - - capi_bm_unit_tests - - capi_bm_v1a2_integration_tests_ubuntu - - capi_bm_v1a2_integration_tests_centos - - linter_tests - repo: - org: "Nordix" - name: "baremetal-operator" - -- project: - name: "nordix_capi" - jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - - linter_tests - repo: - org: "Nordix" - name: "cluster-api" - -- project: - name: "nordix_metal3_dev_env" - jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - - capi_bm_v1a2_integration_tests_ubuntu - - capi_bm_v1a2_integration_tests_centos - - linter_tests - repo: - org: "Nordix" - name: "metal3-dev-env" - -- project: - name: "nordix_capi_bm" - jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - - capi_bm_unit_tests - - capi_bm_v1a2_integration_tests_centos - - capi_bm_v1a2_integration_tests_ubuntu - - linter_tests - repo: - org: "Nordix" - name: "cluster-api-provider-baremetal" - project: name: "metal3io_bmo" - 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 - repo: org: "metal3-io" name: "baremetal-operator" - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - project: name: "metal3io_metal3_dev_env" - ci_github_whitelist_org: - - metal3-io - - nordix-airship jobs: - capi_bm_integration_tests_ubuntu - capi_bm_integration_tests_centos @@ -135,80 +72,30 @@ - capi_bm_v1a2_integration_tests_ubuntu - capi_bm_v1a2_master_integration_tests_ubuntu - capi_bm_v1a2_master_integration_tests_centos - repo: org: "metal3-io" name: "metal3-dev-env" - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - project: name: "metal3io_capi_bm" - 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 - repo: org: "metal3-io" name: "cluster-api-provider-baremetal" - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - project: name: "metal3io_ironic_image" - 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 - repo: org: "metal3-io" name: "ironic-image" - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - project: name: "metal3io_ironic_inspector" - 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 - repo: org: "metal3-io" name: "ironic-inspector-image" - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - project: name: "metal3io_ironic_ipa_downloader" - 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 - repo: org: "metal3-io" name: "ironic-ipa-downloader" - ci_ghprb_auth_id: '66556785-bf9b-42a0-812f-ccfd3c59f85c' - -- project: - name: 'update_nordix' - jobs: - - update_nordix_repos - repo: - org: "Nordix" - name: "airship-dev-tools" -- 2.25.1