From 4eeac87b51b3e641c674fe338b750acfd0ac2326 Mon Sep 17 00:00:00 2001 From: maelk Date: Wed, 4 Mar 2020 19:12:08 +0200 Subject: [PATCH] Airship: remove v1alpha1 jobs and add new repo adds cluster-api-provider-metal3 repo for v1alpha3 and cluster-api-provider-baremetal repo for v1alpha2 Change-Id: Ifb74600af0d822d9cac99de33d801efb18b9ab63 --- .../job_capi_bm_integration_tests_centos.yml | 113 ------------------ .../job_capi_bm_integration_tests_ubuntu.yml | 113 ------------------ ...api_bm_master_integration_tests_centos.yml | 92 -------------- ...api_bm_master_integration_tests_ubuntu.yml | 92 -------------- ..._capi_bm_v1a3_integration_tests_centos.yml | 4 +- ..._capi_bm_v1a3_integration_tests_ubuntu.yml | 4 +- jjb/airship/projects.yml | 23 ++-- 7 files changed, 11 insertions(+), 430 deletions(-) delete mode 100644 jjb/airship/job_capi_bm_integration_tests_centos.yml delete mode 100644 jjb/airship/job_capi_bm_integration_tests_ubuntu.yml delete mode 100644 jjb/airship/job_capi_bm_master_integration_tests_centos.yml delete mode 100644 jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml deleted file mode 100644 index 72fdd937d..000000000 --- a/jjb/airship/job_capi_bm_integration_tests_centos.yml +++ /dev/null @@ -1,113 +0,0 @@ ---- -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -# Description: -# ============ -# This file contains job template definition for K8s CAPI Baremetal integration tests. -# This job can be triggered manually or through a Github pull request. It creates a -# pipeline job. The pipeline scripts are maintained in Airship CI repository. - -- job-template: - id: capi_bm_integration_tests_centos - name: '{job_prefix}_{name}_integration_test_centos' - description: "K8s CAPI baremetal integration tests for {repo[org]}/{repo[name]} on CentOS. " - project-type: pipeline - defaults: global - disabled: False - concurrent: True - parameters: - - string: - name: PROJECT_REPO_ORG - default: '{repo[org]}' - description: 'Project github repo org name' - - string: - name: PROJECT_REPO_NAME - default: '{repo[name]}' - description: 'Project github repo name' - - string: - name: ghprbActualCommit - default: 'master' - description: 'CI Repo branch for triggering manual build' - - string: - name: ghprbAuthorRepoGitUrl - default: 'https://github.com/{repo[org]}/{repo[name]}.git' - description: 'CI Repo URL for triggering manual build' - - string: - name: DISTRIBUTION - default: 'centos' - description: 'Distribution to use for the tests. Can be ubuntu or centos' - - string: - name: CAPI_VERSION - default: 'v1alpha1' - description: 'Cluster API version. Can be v1alpha1 or v1alpha2' - - string: - name: TARGET_NODE_OS - default: 'Centos' - description: 'Distribution to use for the target host.' - - string: - name: TARGET_NODE_MEMORY - default: 8192 - description: 'RAM size of the target host.' - - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 300 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 - - github: - url: https://github.com/{repo[org]}/{repo[name]} - - 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-centos-integration' - 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' - - 'v1alpha1' - status-context: "test-centos-integration" - success-status: "Passed" - failure-status: "Failed" - error-status: "Error" - cancel-builds-on-update: True - pipeline-scm: - scm: - - git: - url: "{ci_github_repo}" - credentials-id: "{ci_github_jenkins_credentials_id}" - branches: - - '{branch|master}' - name: 'origin' - refspec: '+refs/heads/*:refs/remotes/origin/*' - wipe-workspace: True - honor-refspec: True - shallow-clone: False - 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 deleted file mode 100644 index 274bb898c..000000000 --- a/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml +++ /dev/null @@ -1,113 +0,0 @@ ---- -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -# Description: -# ============ -# This file contains job template definition for K8s CAPI Baremetal integration tests. -# This job can be triggered manually or through a Github pull request. It creates a -# pipeline job. The pipeline scripts are maintained in Airship CI repository. - -- job-template: - id: capi_bm_integration_tests_ubuntu - name: '{job_prefix}_{name}_integration_test_ubuntu' - description: "K8s CAPI baremetal integration tests for {repo[org]}/{repo[name]} on Ubuntu. " - project-type: pipeline - defaults: global - disabled: False - concurrent: True - parameters: - - string: - name: PROJECT_REPO_ORG - default: '{repo[org]}' - description: 'Project github repo org name' - - string: - name: PROJECT_REPO_NAME - default: '{repo[name]}' - description: 'Project github repo name' - - string: - name: ghprbActualCommit - default: 'master' - description: 'CI Repo branch for triggering manual build' - - string: - name: ghprbAuthorRepoGitUrl - default: 'https://github.com/{repo[org]}/{repo[name]}.git' - description: 'CI Repo URL for triggering manual build' - - string: - name: DISTRIBUTION - default: 'ubuntu' - description: 'Distribution to use for the tests. Can be ubuntu or centos' - - string: - name: CAPI_VERSION - default: 'v1alpha1' - description: 'Cluster API version. Can be v1alpha1 or v1alpha2' - - string: - name: TARGET_NODE_OS - default: 'Centos' - description: 'Distribution to use for the target host.' - - string: - name: TARGET_NODE_MEMORY - default: 8192 - description: 'RAM size of the target host.' - - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 300 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 - - github: - url: https://github.com/{repo[org]}/{repo[name]} - - 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' - 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' - - 'v1alpha1' - status-context: "test-integration" - success-status: "Passed" - failure-status: "Failed" - error-status: "Error" - cancel-builds-on-update: True - pipeline-scm: - scm: - - git: - url: "{ci_github_repo}" - credentials-id: "{ci_github_jenkins_credentials_id}" - branches: - - '{branch|master}' - name: 'origin' - refspec: '+refs/heads/*:refs/remotes/origin/*' - wipe-workspace: True - honor-refspec: True - shallow-clone: False - 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 deleted file mode 100644 index 9bcbd7e1f..000000000 --- a/jjb/airship/job_capi_bm_master_integration_tests_centos.yml +++ /dev/null @@ -1,92 +0,0 @@ ---- -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -# Description: -# ============ -# This file contains job template definition for K8s CAPI Baremetal integration tests. -# This job can be triggered manually or through a Github pull request. It creates a -# pipeline job. The pipeline scripts are maintained in Airship CI repository. - -- job-template: - id: capi_bm_master_integration_tests_centos - name: '{job_prefix}_master_integration_test_centos' - description: "K8s CAPI baremetal integration tests for {repo[org]}/{repo[name]} master on CentOS. " - project-type: pipeline - defaults: global - disabled: False - concurrent: True - parameters: - - string: - name: PROJECT_REPO_ORG - default: '{repo[org]}' - description: 'Project github repo org name' - - string: - name: PROJECT_REPO_NAME - default: '{repo[name]}' - description: 'Project github repo name' - - string: - name: ghprbActualCommit - default: 'master' - description: 'CI Repo branch for triggering manual build' - - string: - name: ghprbAuthorRepoGitUrl - default: 'https://github.com/{repo[org]}/{repo[name]}.git' - description: 'CI Repo URL for triggering manual build' - - string: - name: DISTRIBUTION - default: 'centos' - description: 'Distribution to use for the tests. Can be ubuntu or centos' - - string: - name: CAPI_VERSION - default: 'v1alpha1' - description: 'Cluster API version. Can be v1alpha1 or v1alpha2' - - string: - name: TARGET_NODE_OS - default: 'Centos' - description: 'Distribution to use for the target host.' - - string: - name: TARGET_NODE_MEMORY - default: 8192 - description: 'RAM size of the target host.' - - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 300 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 - - triggers: - - timed: "@midnight" - - pipeline-scm: - scm: - - git: - url: "{ci_github_repo}" - credentials-id: "{ci_github_jenkins_credentials_id}" - branches: - - '{branch|master}' - name: 'origin' - refspec: '+refs/heads/*:refs/remotes/origin/*' - wipe-workspace: True - honor-refspec: True - shallow-clone: False - 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 deleted file mode 100644 index f389cdd60..000000000 --- a/jjb/airship/job_capi_bm_master_integration_tests_ubuntu.yml +++ /dev/null @@ -1,92 +0,0 @@ ---- -# -# ============LICENSE_START======================================================= -# Copyright (C) 2019 Nordix Foundation. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -# Description: -# ============ -# This file contains job template definition for K8s CAPI Baremetal integration tests. -# This job can be triggered manually or through a Github pull request. It creates a -# pipeline job. The pipeline scripts are maintained in Airship CI repository. - -- job-template: - id: capi_bm_master_integration_tests_ubuntu - name: '{job_prefix}_master_integration_test_ubuntu' - description: "K8s CAPI baremetal integration tests for {repo[org]}/{repo[name]} master on Ubuntu. " - project-type: pipeline - defaults: global - disabled: False - concurrent: True - parameters: - - string: - name: PROJECT_REPO_ORG - default: '{repo[org]}' - description: 'Project github repo org name' - - string: - name: PROJECT_REPO_NAME - default: '{repo[name]}' - description: 'Project github repo name' - - string: - name: ghprbActualCommit - default: 'master' - description: 'CI Repo branch for triggering manual build' - - string: - name: ghprbAuthorRepoGitUrl - default: 'https://github.com/{repo[org]}/{repo[name]}.git' - description: 'CI Repo URL for triggering manual build' - - string: - name: DISTRIBUTION - default: 'ubuntu' - description: 'Distribution to use for the tests. Can be ubuntu or centos' - - string: - name: CAPI_VERSION - default: 'v1alpha1' - description: 'Cluster API version. Can be v1alpha1 or v1alpha2' - - string: - name: TARGET_NODE_OS - default: 'Centos' - description: 'Distribution to use for the target host.' - - string: - name: TARGET_NODE_MEMORY - default: 8192 - description: 'RAM size of the target host.' - - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 300 - artifact-days-to-keep: -1 - artifact-num-to-keep: -1 - - triggers: - - timed: "@midnight" - - pipeline-scm: - scm: - - git: - url: "{ci_github_repo}" - credentials-id: "{ci_github_jenkins_credentials_id}" - branches: - - '{branch|master}' - name: 'origin' - refspec: '+refs/heads/*:refs/remotes/origin/*' - wipe-workspace: True - honor-refspec: True - shallow-clone: False - script-path: "{ci_github_pipeline}" - lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml index 306377680..4d88567dd 100644 --- a/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_centos.yml @@ -82,7 +82,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '/test-v1a3-centos-integration' + trigger-phrase: '/test-centos-integration' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -92,7 +92,7 @@ white-list-target-branches: - 'master' - 'release-0.3' - status-context: "test-v1a3-centos-integration" + status-context: "test-centos-integration" success-status: "Passed" failure-status: "Failed" error-status: "Error" diff --git a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml index f18407738..9e1408c51 100644 --- a/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a3_integration_tests_ubuntu.yml @@ -82,7 +82,7 @@ org-list: "{ci_github_whitelist_org}" cron: 'H/5 * * * *' auth-id: "{ci_ghprb_auth_id}" - trigger-phrase: '/test-v1a3-integration' + trigger-phrase: '/test-integration' skip-build-phrase: '/skip-test' only-trigger-phrase: True github-hooks: True @@ -92,7 +92,7 @@ white-list-target-branches: - 'master' - 'release-0.3' - status-context: "test-v1a3-integration" + status-context: "test-integration" success-status: "Passed" failure-status: "Failed" error-status: "Error" diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index b6d52a13d..976d8b431 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -53,8 +53,6 @@ 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 - capi_bm_v1a3_integration_tests_centos @@ -90,8 +88,6 @@ 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 - capi_bm_v1a3_integration_tests_centos @@ -100,10 +96,6 @@ - project: name: "metal3io_metal3_dev_env" jobs: - - capi_bm_integration_tests_ubuntu - - capi_bm_integration_tests_centos - - capi_bm_master_integration_tests_ubuntu - - capi_bm_master_integration_tests_centos - capi_bm_v1a2_integration_tests_centos - capi_bm_v1a2_integration_tests_ubuntu - capi_bm_v1a2_master_integration_tests_ubuntu @@ -122,10 +114,15 @@ 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_capi_m3" + repo: + org: "metal3-io" + name: "cluster-api-provider-metal3" + jobs: - capi_bm_v1a3_integration_tests_centos - capi_bm_v1a3_integration_tests_ubuntu @@ -135,8 +132,6 @@ 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 - capi_bm_v1a3_integration_tests_centos @@ -148,8 +143,6 @@ 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 - capi_bm_v1a3_integration_tests_centos @@ -161,8 +154,6 @@ 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 - capi_bm_v1a3_integration_tests_centos -- 2.25.1