From: Robert Tomczyk Date: Mon, 20 Jan 2020 10:15:34 +0000 (+0000) Subject: Merge "OPENDEV: Adding openstack/castellan repository" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=50eb29ec8d1af2bc1a0f0832d4e90d367a54eb7c;hp=8a06c0b4903a3711294d572b045d8a54cb3ba4fc;p=infra%2Fcicd.git Merge "OPENDEV: Adding openstack/castellan repository" --- diff --git a/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-push-upstream-jobs.yml b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-push-upstream-jobs.yml new file mode 100644 index 00000000..0e5799df --- /dev/null +++ b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-push-upstream-jobs.yml @@ -0,0 +1,26 @@ +--- +# ============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========================================================= + +- project: + name: model-deployments-deployment-client-push-upstream + project: model-deployments/deployment-client + project-name: model-deployments-deployment-client + + jobs: + - 'acumos-{project-name}-push-upstream' diff --git a/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-rebase-jobs.yml b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-rebase-jobs.yml new file mode 100644 index 00000000..b90b8912 --- /dev/null +++ b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-rebase-jobs.yml @@ -0,0 +1,26 @@ +--- +# ============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========================================================= +# +- project: + name: model-deployments-deployment-client-rebase + project: model-deployments/deployment-client + project-name: model-deployments-deployment-client + + jobs: + - 'acumos-{project-name}-rebase' diff --git a/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml new file mode 100644 index 00000000..5829d9f8 --- /dev/null +++ b/jjb/acumos/model-deployments-deployment-client/model-deployments-deployment-client-verify-jobs.yaml @@ -0,0 +1,26 @@ +--- +# ============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========================================================= + +- project: + name: model-deployments-deployment-client-verify + project: model-deployments/deployment-client + project-name: model-deployments-deployment-client + jdk-version: java-8 + jobs: + - 'acumos-{project-name}-verify-java' diff --git a/jjb/airship/defaults.yml b/jjb/airship/defaults.yml index 292aee00..f41a72fe 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 4620926c..b0cab355 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 02467b1d..2b0f79a4 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 6776997c..3211f0f0 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 66ba8aef..3a1356ab 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 66dba364..7a5cab01 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 41837d31..2b768675 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 3590a791..96673995 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 787cc243..d54e1254 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 a363dba0..55ebb82e 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: diff --git a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml index f41778bc..1cff8df0 100644 --- a/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml +++ b/jjb/cloud-infra/cloud-infra-engine-verify-deploy.yaml @@ -204,9 +204,10 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' - file-paths: - - compare-type: 'ANT' - pattern: '**' + disable-strict-forbidden-file-verification: 'true' + forbidden-file-paths: + - compare-type: ANT + pattern: 'docs/**' skip-vote: successful: '{obj:successful}' failed: '{obj:failed}'