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 (file)
index 0000000..0e5799d
--- /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 (file)
index 0000000..b90b891
--- /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 (file)
index 0000000..5829d9f
--- /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 292aee00b891720e20721856628e5845d9583dbe..f41a72fe08bc11b7e96fdd855328ef4e117880ef 100644 (file)
--- 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 4620926c054e764a4b2540537b9cdf1e814aa987..b0cab355f386f39e8174abdcd05158c9cf51ed20 100644 (file)
--- 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 02467b1d68e53662cb4e3667eed9be526e10b667..2b0f79a486b3698c8b11343bec6134c4b243ebb7 100644 (file)
--- 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 6776997c44b047e2d1977dbf0fd70ad1aa3aa42f..3211f0f0aef0c25c0e2ae6e9dcfa6b0e43630ab8 100644 (file)
--- 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 66ba8aef61eb17c2e96068751312ae7d594c961c..3a1356abf671eb813a62df9088e7361c752d8e5a 100644 (file)
--- 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 66dba36474bc651a8bf096df9b1731dc317c6d03..7a5cab0168ef0a52ad0ce11ea1fc96d60b340d7d 100644 (file)
--- 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 41837d3157d7e305891b63e0f72e5b7f8d6cc6ee..2b7686759f00c3964f6c28c640c3b71dcfc68126 100644 (file)
--- 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 3590a79155566d5af79b7e91d1faf9b95b47f9bd..966739959e0b8deb7b0f1cd0076d2f409568dcf8 100644 (file)
--- 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 787cc24388d7c7814f9a0da05889cfc0f01d440a..d54e125432e57edf1546380cc80d8034b0e93518 100644 (file)
--- 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 a363dba062cdf035550d4843d89363f772d30c8b..55ebb82eefc8bbd960d47e53d330ff48b6390bcd 100644 (file)
--- 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 f41778bcca152017d69eea4c01cdc6866dbecf45..1cff8df066434a0356d3fa74ebbe7a44d18a7e4e 100644 (file)
--- 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}'