From: maelk Date: Mon, 16 Sep 2019 12:59:18 +0000 (+0300) Subject: Add a centos integration job and rename the ubuntu one X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=e07b44c5d220997b892e73454f5b7403979f2960;p=infra%2Fcicd.git Add a centos integration job and rename the ubuntu one Change-Id: Iff5ea50738164df0ae9b9d4161a702b02e781504 --- diff --git a/jjb/airship/job_capi_bm_integration_tests_centos.yml b/jjb/airship/job_capi_bm_integration_tests_centos.yml new file mode 100644 index 00000000..ad6e26fb --- /dev/null +++ b/jjb/airship/job_capi_bm_integration_tests_centos.yml @@ -0,0 +1,96 @@ +--- +# +# ============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: DISTRIBUTION + default: 'centos' + description: 'Distribution to use for the tests. Can be ubuntu or centos' + + 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_github_jenkins_credentials_id}" + trigger-phrase: '/test-centos-integration' + skip-build-phrase: '/skip-test' + only-trigger-phrase: True + github-hooks: False + permit-all: False + auto-close-on-fail: False + allow-whitelist-orgs-as-admins: True + white-list-target-branches: + - master + status-context: "integration-tests-centos" + success-status: "Passed" + failure-status: "Failed" + error-status: "Error" + cancel-builds-on-update: True + pipeline-scm: + scm: + - git: + url: https://github.com/{ci_github_repo}.git + 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/jobs/capi_bm_integration_tests.pipeline' + lightweight-checkout: False diff --git a/jjb/airship/job_capi_bm_integration_tests.yml b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml similarity index 88% rename from jjb/airship/job_capi_bm_integration_tests.yml rename to jjb/airship/job_capi_bm_integration_tests_ubuntu.yml index 6a0aacf4..70e7a2e2 100644 --- a/jjb/airship/job_capi_bm_integration_tests.yml +++ b/jjb/airship/job_capi_bm_integration_tests_ubuntu.yml @@ -25,9 +25,9 @@ # pipeline job. The pipeline scripts are maintained in Airship CI repository. - job-template: - id: capi_bm_integration_tests - name: '{job_prefix}_{name}_integration_test' - description: "K8s CAPI baremetal integration tests for {repo[org]}/{repo[name]}. " + 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 @@ -45,6 +45,10 @@ name: ghprbActualCommit default: 'master' description: 'CI Repo branch for triggering manual build' + - string: + name: DISTRIBUTION + default: 'ubuntu' + description: 'Distribution to use for the tests. Can be ubuntu or centos' properties: - build-discarder: @@ -71,7 +75,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - master - status-context: "integration-tests" + status-context: "integration-tests-ubuntu" success-status: "Passed" failure-status: "Failed" error-status: "Error" @@ -88,5 +92,5 @@ wipe-workspace: True honor-refspec: True shallow-clone: False - script-path: 'ci/jobs/{id}.pipeline' + script-path: 'ci/jobs/capi_bm_integration_tests.pipeline' lightweight-checkout: False diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index edf3aa0c..98fa8945 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -30,7 +30,8 @@ name: 'nordix_dev_tools' branch: '${{ghprbActualCommit}}' jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos - linter_tests repo: org: "Nordix" @@ -39,7 +40,8 @@ - project: name: "nordix_bmo" jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos - capi_bm_unit_tests - linter_tests repo: @@ -49,7 +51,8 @@ - project: name: "nordix_capi" jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos - linter_tests repo: org: "Nordix" @@ -58,7 +61,8 @@ - project: name: "nordix_metal3_dev_env" jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos - linter_tests repo: org: "Nordix" @@ -67,7 +71,8 @@ - project: name: "nordix_capi_bm" jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos - capi_bm_unit_tests - linter_tests repo: @@ -81,7 +86,8 @@ - metal3-io - nordix-airship jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos repo: org: "metal3-io" name: "baremetal-operator" @@ -93,18 +99,20 @@ - metal3-io - nordix-airship jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos repo: org: "metal3-io" name: "metal3-dev-env" - project: name: "metal3io_capi_bm" - ci_github_whitelist_org: + ci_github_whitelist_org: - metal3-io - nordix-airship jobs: - - capi_bm_integration_tests + - capi_bm_integration_tests_ubuntu + - capi_bm_integration_tests_centos repo: org: "metal3-io" name: "cluster-api-provider-baremetal"