Merge "Remove yardstick test phase from k8s release job"
authorNauman Yaseen <nauman.yaseen@est.tech>
Thu, 23 Dec 2021 11:55:49 +0000 (11:55 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Thu, 23 Dec 2021 11:55:49 +0000 (11:55 +0000)
59 files changed:
jjb/airship/job_airship_integration_test_centos.yml
jjb/airship/job_airship_integration_test_ubuntu.yml
jjb/airship/job_bml_integration_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_bml_master_integration_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_capi_bm_unit_tests.yml
jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml [moved from jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml with 95% similarity]
jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml [moved from jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml with 95% similarity]
jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml [moved from jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml with 92% similarity]
jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml [moved from jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml with 92% similarity]
jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_v1b1_integration_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_v1b1_integration_tests_ubuntu.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_v1b1_master_integration_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_v1b1_master_integration_tests_ubuntu.yml [new file with mode: 0644]
jjb/airship/job_feature_tests_centos.yml
jjb/airship/job_feature_tests_ubuntu.yml
jjb/airship/job_feature_tests_upgrade_ubuntu.yml
jjb/airship/job_ipa_image_building.yml
jjb/airship/job_ipa_image_building_test.yml
jjb/airship/job_linter_tests.yml
jjb/airship/job_master_feature_tests_centos.yml
jjb/airship/job_master_feature_tests_ubuntu.yml
jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
jjb/airship/job_openstack_node_image_building.yml
jjb/airship/projects.yml
jjb/cloud-infra/onap-jobs/onap-verify-deploy-test.yaml
jjb/cloud-infra/onap-jobs/onap-verify-package.yaml
jjb/cloud-infra/scripts/test-package.sh
jjb/eiffel/etos-api.yaml
jjb/eiffel/etos-environment-provider-worker.yaml
jjb/eiffel/etos-environment-provider.yaml
jjb/eiffel/etos-suite-runner.yaml
jjb/eiffel/etos-suite-starter.yaml
jjb/eiffel/etos-test-runner-containers-base.yaml
jjb/eiffel/etos-test-runner-containers-go.yaml
jjb/eiffel/etos-test-runner-containers-python.yaml
jjb/eiffel/etos-test-runner-containers-rust.yaml
jjb/global/jjb-macros.yaml
jjb/onap/integration-simulators-A1-policy-enforcement-simulator/integration-simulators-A1-policy-enforcement-simulator-rebase-jobs.yaml [new file with mode: 0644]
jjb/onap/integration-simulators-A1-policy-enforcement-simulator/integration-simulators-A1-policy-enforcement-simulator-upstream-jobs.yaml [new file with mode: 0644]
jjb/onap/integration-usecases-A1-policy-enforcement-r-apps/integration-usecases-A1-policy-enforcement-r-apps-push-upstream-jobs.yaml [new file with mode: 0644]
jjb/onap/integration-usecases-A1-policy-enforcement-r-apps/integration-usecases-A1-policy-enforcement-r-apps-rebase-jobs.yaml [new file with mode: 0644]
jjb/onap/integration-usecases-A1-policy-enforcement/integration-usecases-A1-policy-enforcement-rebase-jobs.yaml [new file with mode: 0644]
jjb/onap/integration-usecases-A1-policy-enforcement/integration-usecases-A1-policy-enforcement-upstream-jobs.yaml [new file with mode: 0644]
jjb/onap/oom/oom-build-jobs.yaml
jjb/onap/sdc/sdc-verify-jobs.yaml
jjb/oransc/global-templates-oran-java.yaml
jjb/oransc/verify-jobs.sh

index 56d77aae4a84599afdfa603cdcbdf3537199dfed..24fcaefaae060699905ff0272e2043b129075bca 100644 (file)
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-integration-airship-centos"
         success-status: "Passed"
         failure-status: "Failed"
index 70141fc5a3760df1383fd8380e825b10fbd0d21b..c5c87309f0be9c08d82ea9e67cdd4665857e3247 100644 (file)
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_bml_integration_tests_centos.yml b/jjb/airship/job_bml_integration_tests_centos.yml
new file mode 100644 (file)
index 0000000..35fcb03
--- /dev/null
@@ -0,0 +1,121 @@
+---
+#
+# ============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 CAPM3 integration test.
+# 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: bml_integration_tests_centos
+    name: '{job_prefix}_{name}_bml_integration_tests_centos'
+    description: "K8s CAPIM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
+    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: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Centos'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        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: '((.|\n)*\s)?/test-integration-bml-centos(\s(.|\n)*)?'
+        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'
+          - 'main'
+        status-context: "test-integration-bml-centos"
+        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: 'jenkins/jobs/bml_integration_tests.pipeline'
+      lightweight-checkout: False
diff --git a/jjb/airship/job_bml_master_integration_tests_centos.yml b/jjb/airship/job_bml_master_integration_tests_centos.yml
new file mode 100644 (file)
index 0000000..5ede24e
--- /dev/null
@@ -0,0 +1,100 @@
+---
+#
+# ============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 CAPM3 integration test.
+# 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: bml_master_integration_tests_centos
+    name: '{job_prefix}_master_bml_integration_tests_centos'
+    description: "K8s CAPIM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
+    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: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Centos'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        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: "H 2 * * *"
+    
+    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: 'jenkins/jobs/bml_integration_tests.pipeline'
+      lightweight-checkout: False
index 55c9eceff3d6a90e886972a5389a6f684c8f7d54..46cb37baff10d4081efcf899f121d9d122e29795 100644 (file)
@@ -71,6 +71,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - master
+          - main
         status-context: "integration-tests"
         success-status: "Passed"
         failure-status: "Failed"
index 4fe1c682d65cd2213bb9bfe4d4a3c613481041bc..b07ee528b65123319e628999444b02f6dc6179ff 100644 (file)
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
           - 'release-0.4'
           - 'release-0.0'
         status-context: "test-v1a4-centos-integration"
index e878814c53fd1947a0ab2d943bf8010b0c5b96c5..96fa2022b8856d5bb019c1849721026625df96b0 100644 (file)
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
           - 'release-0.4'
           - 'release-0.0'
         status-context: "test-v1a4-integration"
index 0ba9bb44d5dd141a3baa11fb678cd50152783ec7..424f1e67e59aec694613314d4f04c485db8e8580 100644 (file)
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:
@@ -86,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "0 4 * * *"
 
     pipeline-scm:
       scm:
index 1dabb07d9bda5d68550ddf754f276f9a4728ac9c..8fb68ae6aa93ecc65a0565cb23a2eed53a39eec7 100644 (file)
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.21.2"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:
@@ -86,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "15 4 * * *"
 
     pipeline-scm:
       scm:
index 0e0d7802c42fff8092bbf8ae3a3b74253fff6b36..0cbf3ee5fbb65ce2b33285ce854affb596f23599 100644 (file)
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API version. Can be v1alpha4.'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha5'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Centos'
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -94,7 +90,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-centos-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a5-centos-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-        status-context: "test-centos-integration"
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
+        status-context: "test-v1a5-centos-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
index 8cc6b960c6c7dcc83502e7bb906c19fb19b1d86f..531e83fecaeeb11516db012e6bd516dcfd0a01e0 100644 (file)
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API version. Can be v1alpha4.'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha5'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -94,7 +90,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-v1a5-integration(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-        status-context: "test-integration"
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
+        status-context: "test-v1a5-integration"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
index 1e6e2d19192cc624e55b02979c285e010c9d5918..7cc3fc0b4f5903662b182488c839abefa46ba79b 100644 (file)
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API version. Can be v1alpha4.'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha5'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Centos'
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
-        
+
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -86,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "30 4 * * *"
 
     pipeline-scm:
       scm:
index 3e3b0f16d918fbf133bcf9cc95760229a820b43c..3c6efafbcd92bc38f5612b4fe3cd3103796299c7 100644 (file)
     - string:
         name: CAPI_VERSION
         default: 'v1alpha4'
-        description: 'Cluster API version. Can be v1alpha4.'
+        description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
         default: 'v1alpha5'
-        description: 'Cluster API provider Metal3 version. Can be v1alpha5 or v1alpha4.'
+        description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         default: 'Ubuntu'
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
-         
+
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -86,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "45 4 * * *"
 
     pipeline-scm:
       scm:
similarity index 95%
rename from jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml
rename to jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml
index c7ba0e8232675626b97755f08600fd5ccf7b600c..c9540dcaef4f824c1dd0b14e6816959c3cd990cf 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Airship CI repository.
 
 - job-template:
-    id: capi_capm3_v1a5_e2e_tests_centos
-    name: '{job_prefix}_{name}_e2e_test_centos'
+    id: capi_capm3_e2e_v1a5_tests_centos
+    name: '{job_prefix}_{name}_v1a5_e2e_test_centos'
     description: "K8s CAPI metal3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
+          - 'release-0.5'
         status-context: "test-v1a5-centos-e2e"
         success-status: "Passed"
         failure-status: "Failed"
similarity index 95%
rename from jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
rename to jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml
index 32a242d0184a1a13a7ac2f9663e2ed7b2d7875c0..d3578d33c39f1530d200ff011b56d3909cd78f55 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Airship CI repository.
 
 - job-template:
-    id: capi_capm3_v1a5_e2e_tests_ubuntu
-    name: '{job_prefix}_{name}_e2e_test_ubuntu'
+    id: capi_capm3_e2e_v1a5_tests_ubuntu
+    name: '{job_prefix}_{name}_v1a5_e2e_test_ubuntu'
     description: "K8s CAPI metal3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
         
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
+          - 'release-0.5'
         status-context: "test-v1a5-e2e"
         success-status: "Passed"
         failure-status: "Failed"
diff --git a/jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml b/jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml
new file mode 100644 (file)
index 0000000..47b11a3
--- /dev/null
@@ -0,0 +1,125 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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 e2e 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_capm3_e2e_v1b1_tests_centos
+    name: '{job_prefix}_{name}_v1b1_e2e_test_centos'
+    description: "K8s CAPI metal3 v1beta1 e2e 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: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version. Can be v1beta1.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version. Can be v1beta1.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Centos'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        description: 'RAM size of the target host.'
+    - string:
+        name: TESTS_FOR
+        default: "e2e_tests"
+        description: 'Tests using the e2e framework.'
+
+    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: '((.|\n)*\s)?/test-v1b1-centos-e2e(\s(.|\n)*)?'
+        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'
+          - 'main'
+        status-context: "test-v1b1-centos-e2e"
+        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_capm3_e2e_v1b1_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..ce505dd
--- /dev/null
@@ -0,0 +1,125 @@
+---
+#
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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 e2e 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_capm3_e2e_v1b1_tests_ubuntu
+    name: '{job_prefix}_{name}_v1b1_e2e_test_ubuntu'
+    description: "K8s CAPI metal3 v1beta1 e2e 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: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'ubuntu'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version. Can be v1beta1.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version. Can be v1beta1.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Ubuntu'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        description: 'RAM size of the target host.'
+    - string:
+        name: TESTS_FOR
+        default: "e2e_tests"
+        description: 'Tests using the e2e framework.'
+
+    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: '((.|\n)*\s)?/test-v1b1-e2e(\s(.|\n)*)?'
+        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'
+          - 'main'
+        status-context: "test-v1b1-e2e"
+        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
similarity index 92%
rename from jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
rename to jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml
index 48aa86f7c27531c7c46e9b4f2e02a1c51c3c5c52..5dca4e6701945313f267df60ce907ce53065be5b 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in metal3 project infra repository.
 
 - job-template:
-    id: capi_capm3_v1a5_master_e2e_tests_centos
-    name: '{job_prefix}_{name}_master_e2e_test_centos'
+    id: capi_capm3_master_e2e_v1a5_tests_centos
+    name: '{job_prefix}_master_e2e_v1a5_test_centos'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'release-0.5'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'release-0.5'
         description: 'Target branch of the PR'
     - string:
         name: DISTRIBUTION
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:
similarity index 92%
rename from jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
rename to jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml
index 6e8d022f215e648ea832c38fc65be2878a3ace58..eef301fdc611d40940a6db0ed5e0413abe3463d5 100644 (file)
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in metal3 project infra repository.
 
 - job-template:
-    id: capi_capm3_v1a5_master_e2e_tests_ubuntu
-    name: '{job_prefix}_{name}_master_e2e_test_ubuntu'
+    id: capi_capm3_master_e2e_v1a5_tests_ubuntu
+    name: '{job_prefix}_master_e2e_v1a5_test_ubuntu'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global
@@ -43,7 +43,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'release-0.5'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -51,7 +51,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'release-0.5'
         description: 'Target branch of the PR'
     - string:
         name: DISTRIBUTION
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-    - string:
-        name: KUBERNETES_VERSION
-        default: "v1.22.0"
-        description: 'Kubernetes version'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml b/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml
new file mode 100644 (file)
index 0000000..56b2a9c
--- /dev/null
@@ -0,0 +1,108 @@
+---
+#
+# ============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 CAPM3 E2E tests.
+# This job can be triggered manually or periodically by the CI system. It creates a
+# pipeline job. The pipeline scripts are maintained in metal3 project infra repository.
+
+- job-template:
+    id: capi_capm3_master_e2e_v1b1_tests_centos
+    name: '{job_prefix}_master_e2e_v1b1_test_centos'
+    description: "CAPM3 v1beta1 e2e 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: 'main'
+        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: ghprbTargetBranch
+        default: 'main'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests.'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Centos'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        description: 'RAM size of the target host.'
+    - string:
+        name: NUM_NODES
+        default: 4
+        description: 'Number of libvirt VMs.'
+    - string:
+        name: TESTS_FOR
+        default: "e2e_tests"
+        description: 'Tests using the e2e framework.'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+    triggers:
+      - timed: "H 20 * * *"
+
+    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_capm3_master_e2e_v1b1_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..b209651
--- /dev/null
@@ -0,0 +1,108 @@
+---
+#
+# ============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 CAPM3 E2E tests.
+# This job can be triggered manually or periodically by the CI system. It creates a
+# pipeline job. The pipeline scripts are maintained in metal3 project infra repository.
+
+- job-template:
+    id: capi_capm3_master_e2e_v1b1_tests_ubuntu
+    name: '{job_prefix}_master_e2e_v1b1_test_ubuntu'
+    description: "CAPM3 v1beta1 e2e 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: 'main'
+        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: ghprbTargetBranch
+        default: 'main'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'ubuntu'
+        description: 'Distribution to use for the tests.'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Ubuntu'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        description: 'RAM size of the target host.'
+    - string:
+        name: NUM_NODES
+        default: 4
+        description: 'Number of libvirt VMs.'
+    - string:
+        name: TESTS_FOR
+        default: "e2e_tests"
+        description: 'Tests using the e2e framework.'
+
+    properties:
+    - build-discarder:
+        days-to-keep: 30
+        num-to-keep: 300
+        artifact-days-to-keep: -1
+        artifact-num-to-keep: -1
+
+    triggers:
+      - timed: "H 20 * * *"
+
+    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_capm3_v1b1_integration_tests_centos.yml b/jjb/airship/job_capi_capm3_v1b1_integration_tests_centos.yml
new file mode 100644 (file)
index 0000000..38552ab
--- /dev/null
@@ -0,0 +1,121 @@
+---
+#
+# ============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 CAPM3 v1beta1 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: capm3_v1b1_integration_tests_centos
+    name: '{job_prefix}_{name}_v1b1_integration_test_centos'
+    description: "CAPM3 v1beta1 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: 'main'
+        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: ghprbTargetBranch
+        default: 'main'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Centos'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        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: '((.|\n)*\s)?/test-v1b1-centos-integration(\s(.|\n)*)?'
+        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'
+          - 'main'
+        status-context: "test-v1b1-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
\ No newline at end of file
diff --git a/jjb/airship/job_capi_capm3_v1b1_integration_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1b1_integration_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..f51133b
--- /dev/null
@@ -0,0 +1,121 @@
+---
+#
+# ============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 CAPM3 v1beta1 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: capm3_v1b1_integration_tests_ubuntu
+    name: '{job_prefix}_{name}_v1b1_integration_test_ubuntu'
+    description: "CAPM3 v1beta1 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: 'main'
+        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: ghprbTargetBranch
+        default: 'main'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'ubuntu'
+        description: 'Distribution to use for the tests. Can be ubuntu or centos'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Ubuntu'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        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: '((.|\n)*\s)?/test-v1b1-integration(\s(.|\n)*)?'
+        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'
+          - 'main'
+        status-context: "test-v1b1-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
\ No newline at end of file
diff --git a/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_centos.yml b/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_centos.yml
new file mode 100644 (file)
index 0000000..108dfca
--- /dev/null
@@ -0,0 +1,100 @@
+---
+#
+# ============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 CAPM3 v1beta1 master 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: capm3_v1b1_master_integration_tests_centos
+    name: '{job_prefix}_master_v1b1_integration_test_centos'
+    description: "CAPM3 v1beta1 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: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'centos'
+        description: 'Distribution to use for the tests.'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Centos'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        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: "H 4 * * *"
+
+    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_capm3_v1b1_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..8fdb8c8
--- /dev/null
@@ -0,0 +1,100 @@
+---
+#
+# ============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 CAPM3 v1beta1 master 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: capm3_v1b1_master_integration_tests_ubuntu
+    name: '{job_prefix}_master_v1b1_integration_test_ubuntu'
+    description: "CAPM3 v1beta1 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: ghprbTargetBranch
+        default: 'master'
+        description: 'Target branch of the PR'
+    - string:
+        name: DISTRIBUTION
+        default: 'ubuntu'
+        description: 'Distribution to use for the tests.'
+    - string:
+        name: CAPI_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1beta1'
+        description: 'Cluster API provider Metal3 version.'
+    - string:
+        name: TARGET_NODE_OS
+        default: 'Ubuntu'
+        description: 'Distribution to use for the target host.'
+    - string:
+        name: TARGET_NODE_MEMORY
+        default: 4096
+        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: "H 4 * * *"
+
+    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
index b056a377c123b19dfa41d9d435f051ea155fd82d..d9113dcf73bcaa4141a243bb94f45288f76c502d 100644 (file)
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         name: TESTS_FOR
         default: "feature_tests_centos"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.4'
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
         status-context: "test-features-centos"
         success-status: "Passed"
         failure-status: "Failed"
index 856232aa43ad9398b41e36a4d5f0cb809990e647..e7c46e1e2feff7b0b1d905b3f553163fecba5847 100644 (file)
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         name: TESTS_FOR
         default: "feature_tests"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.4'
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
         status-context: "test-features"
         success-status: "Passed"
         failure-status: "Failed"
index baf5e7a2d38722eb6486060a569e602a46b52f03..9645fc4225bd093564c495abef182845f52d2ee0 100644 (file)
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-          - 'release-0.4'
+          - 'main'
+          - 'release-0.5'
+          - 'release-0.1'
         status-context: "test-upgrade-features"
         success-status: "Passed"
         failure-status: "Failed"
index 74b57280b4502971a1c824b38e18fc9a483bcecd..98ed4189c96bc2b0be64684ab2de2b5046b0d3fd 100644 (file)
     - string:
         name: IRONIC_IMAGE_REPO_COMMIT
         default: 'HEAD'
-        description: 'Ironic Image repo commit hash to build'
+        description: 'Ironic Image repository commit hash to build'
     - string:
         name: IRONIC_IMAGE_BRANCH
         default: 'master'
-        description: 'Ironic image repo branch to build'
+        description: 'Ironic image repository branch to build'
     - string:
         name: IRONIC_INSPECTOR_REFSPEC
         default: ''
         description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
     - string:
-        name: IPA_REPO_COMMIT
+        name: IPA_COMMIT
         default: 'HEAD'
-        description: 'Ironic Python Agent repo commit hash to build'
+        description: 'Ironic Python Agent repository commit hash to build'
     - string:
         name: IPA_BRANCH
         default: 'master'
-        description: 'Ironic Python Agent repo branch to build'
+        description: 'Ironic Python Agent repository branch to build'
+    - string:
+        name: BMO_COMMIT
+        default: 'HEAD'
+        description: 'Bare Metal Operator repository commit hash to build'
+    - string:
+        name: BMO_BRANCH
+        default: 'master'
+        description: 'Bare Metal Operator repository branch to build'
+    - string:
+        name: IPA_BUILDER_BRANCH
+        default: 'master'
+        description: 'Ironic Python Agent builder repository tool branch'
+    - string:
+        name: IPA_BUILDER_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Python Agent builder repository tool commit'
+    - string:
+        name: METAL3_DEV_ENV_BRANCH
+        default: 'master'
+        description: 'Metal3 dev env repository branch'
+    - string:
+        name: METAL3_DEV_ENV_COMMIT
+        default: 'HEAD'
+        description: 'Metal3 dev env repository commit'
     - string:
         name: STAGING
         default: 'true'
index 0e539c65f8de861ee574d1013653dac777d8541b..10d8b52fcf21890b0923c99124ec7c175626aaca 100644 (file)
     disabled: False
     concurrent: True
     parameters:
+    - string:
+        name: IRONIC_REFSPEC
+        default: ''
+        description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
+    - string:
+        name: IRONIC_IMAGE_REPO_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Image repository commit hash to build'
+    - string:
+        name: IRONIC_IMAGE_BRANCH
+        default: 'master'
+        description: 'Ironic image repository branch to build'
+    - string:
+        name: IRONIC_INSPECTOR_REFSPEC
+        default: ''
+        description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
+    - string:
+        name: IPA_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Python Agent repository commit hash to build'
+    - string:
+        name: IPA_BRANCH
+        default: 'master'
+        description: 'Ironic Python Agent repository branch to build'
+    - string:
+        name: BMO_COMMIT
+        default: 'HEAD'
+        description: 'Bare Metal Operator repository commit hash to build'
+    - string:
+        name: BMO_BRANCH
+        default: 'master'
+        description: 'Bare Metal Operator repository branch to build'
+    - string:
+        name: IPA_BUILDER_BRANCH
+        default: 'master'
+        description: 'Ironic Python Agent builder repository tool branch'
+    - string:
+        name: IPA_BUILDER_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Python Agent builder repository tool commit'
+    - string:
+        name: METAL3_DEV_ENV_BRANCH
+        default: 'master'
+        description: 'Metal3 dev env repository branch'
+    - string:
+        name: METAL3_DEV_ENV_COMMIT
+        default: 'HEAD'
+        description: 'Metal3 dev env repository commit'
     - string:
         name: PROJECT_REPO_ORG
         default: '{repo[org]}'
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-ipa"
         success-status: "Passed"
         failure-status: "Failed"
index b3259430398928cc0e461f1f6458c9d76b9922cb..339003122fb74df1272e1afc62c0d3278185bd5c 100644 (file)
@@ -71,6 +71,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - master
+          - main
         status-context: "linter-tests"
         success-status: "Passed"
         failure-status: "Failed"
index 670197edc38bd44fdf2ee770c654686b676cb202..37b4d08fc0fc94b0e6909448ceb3581bbf1d8e6f 100644 (file)
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         name: TESTS_FOR
         default: "feature_tests_centos"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
@@ -90,7 +94,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 18 * * *"
+      - timed: "H 17 * * *"
 
     pipeline-scm:
       scm:
index 830b1fa9eae726f39c0ed210c07401b06adc377c..0771d292d563441bdf14c507ca62ddd28a6c6067 100644 (file)
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         name: TESTS_FOR
         default: "feature_tests"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
@@ -90,7 +94,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 18 * * *"
+      - timed: "H 17 * * *"
 
     pipeline-scm:
       scm:
index 7ea564b71a4d5525f2356d2c14da3f6be976aa00..82f6b066b90ef5e99325aa44ad9182a170dc44e4 100644 (file)
         description: 'Distribution to use for the tests.'
     - string:
         name: CAPI_VERSION
-        default: 'v1alpha4'
+        default: 'v1beta1'
         description: 'Cluster API version.'
     - string:
         name: CAPM3_VERSION
-        default: 'v1alpha5'
+        default: 'v1beta1'
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
@@ -90,7 +94,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H H(21-23) * * *"
+      - timed: "H 17 * * *"
 
     pipeline-scm:
       scm:
index 8e257ee83acabe8c38ea16f627b7f7db75a491ec..f19144a8b114472b6cafc7ae90abe622918e3d6a 100644 (file)
@@ -37,7 +37,7 @@
         name: KUBERNETES_VERSION
         default: "v1.22.0"
         description: 'Kubernetes version'
-  
+
     properties:
     - build-discarder:
         days-to-keep: 30
 
     triggers:
       - timed: "0 5 */15 * *"
+      - github-pull-request:
+          included-regions:
+                - "ci/images/.*"
+                - "ci/scripts/image_scripts/.*"
 
     pipeline-scm:
       scm:
index c7e424d2e49ed36b5787e4d01709c26326478d30..38699997671a952bda8eec5f58b79a96f4745b80 100644 (file)
@@ -53,8 +53,6 @@
 - project:
     name: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
     repo:
       org: "metal3-io"
       name: "project-infra"
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
+    - bml_integration_tests_centos
 
 - project:
     name: 'metal3io_project_infra_cleanup'
-    ci_github_whitelist_org:
-    - nordix-airship
     repo:
       org: "metal3-io"
       name: "project-infra"
@@ -89,6 +88,8 @@
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
 
 - project:
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
 
 - project:
     name: "metal3io_metal3_dev_env"
     - capi_bm_v1a5_integration_tests_ubuntu
     - capi_bm_v1a5_master_integration_tests_centos
     - capi_bm_v1a5_master_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - capm3_v1b1_master_integration_tests_centos
+    - capm3_v1b1_master_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
     - master_feature_tests_ubuntu
     - master_feature_tests_centos
     - master_feature_tests_upgrade_ubuntu
+    - bml_integration_tests_centos
+    - bml_master_integration_tests_centos
 
     repo:
       org: "metal3-io"
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
-    - capi_capm3_v1a5_e2e_tests_ubuntu
-    - capi_capm3_v1a5_e2e_tests_centos
-    - capi_capm3_v1a5_master_e2e_tests_ubuntu
-    - capi_capm3_v1a5_master_e2e_tests_centos
+    - capi_capm3_e2e_v1a5_tests_ubuntu
+    - capi_capm3_e2e_v1a5_tests_centos
+    - capi_capm3_master_e2e_v1a5_tests_ubuntu
+    - capi_capm3_master_e2e_v1a5_tests_centos
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
+    - capi_capm3_e2e_v1b1_tests_centos
+    - capi_capm3_e2e_v1b1_tests_ubuntu
+    - capi_capm3_master_e2e_v1b1_tests_centos
+    - capi_capm3_master_e2e_v1b1_tests_ubuntu
 
 
 - project:
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
     jobs:
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1b1_integration_tests_centos
+    - capm3_v1b1_integration_tests_ubuntu
index 6caf4e9b6835caf99945bfbcf09f336adaeb4f6d..c94eef33ad4d44157f7e9a375af16def95203faf 100644 (file)
@@ -25,7 +25,7 @@
     stream:
       - 'master':
           branch: '{stream}'
-          k8s-version: 'master'
+          k8s-version: '1.19'
           deploy-scenario: 'onap-full-nofeature'
       - 'guilin':
           branch: '{stream}'
@@ -49,7 +49,7 @@
           unstable: false
           notbuilt: false
       - offline:
-          disabled: false
+          disabled: true
           execution-mode: offline-deployment
           successful: false
           failed: false
@@ -77,8 +77,8 @@
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
 
     # This should be
-    dependency-jobs: 'onap-verify-package-{distro}-{stream}'
-    dependency-job-var: 'TRIGGER_onap_verify_package_{distro}_{stream}_BUILD_RESULT'
+    dependency-jobs: 'onap-verify-tox-{stream}'
+    dependency-job-var: 'TRIGGER_onap_verify_tox_{stream}_BUILD_RESULT'
 
     jobs:
       - 'onap-verify-{environment-type}-deploy-test-{distro}-{cloud}-{type}-{stream}'
     wrappers:
       - build-timeout:
           timeout: 600
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - file:
               credential-id: '{openrc-credentials-file}'
index 4add3aaf74f45f712123d6648ade2e39784d5b6c..37795ca0491a04a6ddee47e198c544526638e3bc 100644 (file)
           single-use: True
       - build-timeout:
           timeout: 300
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
       - credentials-binding:
           - username-password-separated:
               credential-id: 'nordix-cicd-arm-credentials'
index 8685c337d441b236c75bc3d8d82d23766a488749..d9b9b53275fd16d1b482320a8facf97e975a5f8f 100644 (file)
 set -o errexit
 set -o pipefail
 
-# NOTE (fdegir): we need to remove $WORKSPACE and clone infra/engine repository
-# as infra/engine is what drives the deployment
+# NOTE (akash): ONAP_TEST_BRANCH is set to master as
+# no other branch is available
+export ONAP_TEST_BRANCH="master"
+
+# NOTE (akash): we need to remove $WORKSPACE and clone infra/test repository
+# as infra/test is what drives the deployment
 if [[ "$GERRIT_PROJECT" != "infra/test" ]]; then
   cd "$HOME" && /bin/rm -rf "$WORKSPACE"
   echo "Info : Cloning infra/engine repository"
   git clone -q https://gerrit.nordix.org/infra/test.git "$WORKSPACE"
   cd "$WORKSPACE"
-  export STACK_VERSION="$GERRIT_BRANCH"
 fi
 
 echo "Info  : Packaging test stack $STACK_TYPE"
 
 cd "$WORKSPACE/test"
-./package.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -d "$DISTRO" -v
+./package.sh -s "$STACK_TYPE" -b "$ONAP_TEST_BRANCH" -d "$DISTRO" -v
 
 # vim: set ts=2 sw=2 expandtab:
index 95095d34166b65e53d3ceab6ce56c7ac3e719047..d8c6c83804cde7ea3b64497e45924c005daf9334 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: '{project}'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'Dockerfile'
index bd53d6c4f06e3afc63384f1cd537d4423d97fcce..5c471f5eb41a76d051a5d011ef476358be61afd7 100644 (file)
@@ -25,8 +25,8 @@
     project-name: etos-environment-provider-worker
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: 'etos-environment-provider'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'Dockerfile.workers'
index 34a93c7f3db5a89deae95971bc20d0b591403a06..25c230f07f151a7e4a4201dfc6b9d5d7d35be5ad 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: '{project}'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'Dockerfile'
index 72cf15b9e8c266c429048f08a6cc871fb1395d2d..f70b9d7c5682c0664d556022ade93ed94b74cdec 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: '{project}'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'Dockerfile'
index 5e6ba2ba49856f802506b42db6eb3961db6c78eb..6e0c880845affb454d37a619c82d05fbe16fdfee 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: '{project}'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'Dockerfile'
index 37eb8aa8c4b5da59ca32edd0da7d1eeacc9e712d..653b3ec5baf8c4468766de813900c948764b8fb9 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: 'etos-test-runner-containers'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'base/Dockerfile'
index ca662012eff1f140bcb60115999e06d4e51ffd7c..7a8d67de412c459406ccbae99130dc0e4852d8eb 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: 'etos-test-runner-containers'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'go/Dockerfile'
index ba184b8d554da630cee1231c32f7c6fa11c9c280..fd793a89cdfcd2d995606345851bc7f34be83fd6 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: 'etos-test-runner-containers'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'python/Dockerfile'
index a47154a0f7cad60addda9d7bf7d92651cd585ff6..18e62915a7541b1f3d5fda754e4e383bbd0c0172 100644 (file)
@@ -26,8 +26,8 @@
 
 
     stream:
-      - 'master':
-          branch: 'master'
+      - 'main':
+          branch: 'main'
           project-git-repo: 'etos-test-runner-containers'
           project-build-macro: 'eiffel-global-container-build-macro'
           image-dockerfile: 'rust/Dockerfile'
index b971341cbbe0d2dae557a0581704dc06c6e28369..b85365255aefb9c425a0f165bd14d1ad249b0e57 100644 (file)
     wrappers:
       - credentials-binding:
           - username-password-separated:
-              credential-id: nordix-eiffel-github-token
+              credential-id: nordixinfra-eiffel-username-personal-access-token
               username: NORDIXINFRA_GITHUB_USERNAME
               password: NORDIXINFRA_GITHUB_TOKEN
 
diff --git a/jjb/onap/integration-simulators-A1-policy-enforcement-simulator/integration-simulators-A1-policy-enforcement-simulator-rebase-jobs.yaml b/jjb/onap/integration-simulators-A1-policy-enforcement-simulator/integration-simulators-A1-policy-enforcement-simulator-rebase-jobs.yaml
new file mode 100644 (file)
index 0000000..5c3f83d
--- /dev/null
@@ -0,0 +1,29 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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=========================================================
+#
+# this job gets triggered when a change is merged to
+# integration/simulators/A1-policy-enforcement-simulator project on ONAP Gerrit.
+
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator-rebase
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-simulator
+
+    jobs:
+      - 'onap-{project-name}-rebase'
diff --git a/jjb/onap/integration-simulators-A1-policy-enforcement-simulator/integration-simulators-A1-policy-enforcement-simulator-upstream-jobs.yaml b/jjb/onap/integration-simulators-A1-policy-enforcement-simulator/integration-simulators-A1-policy-enforcement-simulator-upstream-jobs.yaml
new file mode 100644 (file)
index 0000000..6b69c25
--- /dev/null
@@ -0,0 +1,27 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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=========================================================
+
+# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
+- project:
+    name: integration-simulators-A1-policy-enforcement-simulator-push-upstream
+    project: integration/simulators/A1-policy-enforcement-simulator
+    project-name: integration-simulators-A1-policy-enforcement-simulator
+
+    jobs:
+      - 'onap-{project-name}-push-upstream'
diff --git a/jjb/onap/integration-usecases-A1-policy-enforcement-r-apps/integration-usecases-A1-policy-enforcement-r-apps-push-upstream-jobs.yaml b/jjb/onap/integration-usecases-A1-policy-enforcement-r-apps/integration-usecases-A1-policy-enforcement-r-apps-push-upstream-jobs.yaml
new file mode 100644 (file)
index 0000000..8840259
--- /dev/null
@@ -0,0 +1,27 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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=========================================================
+
+# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
+- project:
+    name: integration-usecases-A1-policy-enforcement-r-apps-push-upstream
+    project: integration/usecases/A1-policy-enforcement-r-apps
+    project-name: integration-usecases-A1-policy-enforcement-r-apps
+
+    jobs:
+      - 'onap-{project-name}-push-upstream'
diff --git a/jjb/onap/integration-usecases-A1-policy-enforcement-r-apps/integration-usecases-A1-policy-enforcement-r-apps-rebase-jobs.yaml b/jjb/onap/integration-usecases-A1-policy-enforcement-r-apps/integration-usecases-A1-policy-enforcement-r-apps-rebase-jobs.yaml
new file mode 100644 (file)
index 0000000..8abb813
--- /dev/null
@@ -0,0 +1,29 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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=========================================================
+#
+# this job gets triggered when a change is merged to
+# integration/usecases/A1-policy-enforcement-r-apps project on ONAP Gerrit.
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-r-apps-rebase
+    project: integration/usecases/A1-policy-enforcement-r-apps
+    project-name: integration-usecases-A1-policy-enforcement-r-apps
+
+    jobs:
+      - 'onap-{project-name}-rebase'
diff --git a/jjb/onap/integration-usecases-A1-policy-enforcement/integration-usecases-A1-policy-enforcement-rebase-jobs.yaml b/jjb/onap/integration-usecases-A1-policy-enforcement/integration-usecases-A1-policy-enforcement-rebase-jobs.yaml
new file mode 100644 (file)
index 0000000..f7cdaad
--- /dev/null
@@ -0,0 +1,29 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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=========================================================
+#
+# this job gets triggered when a change is merged to
+# integration/usecases/A1-policy-enforcement project on ONAP Gerrit.
+
+- project:
+    name: integration-usecases-A1-policy-enforcement-rebase
+    project: integration/usecases/A1-policy-enforcement
+    project-name: integration-usecases-A1-policy-enforcement
+
+    jobs:
+      - 'onap-{project-name}-rebase'
diff --git a/jjb/onap/integration-usecases-A1-policy-enforcement/integration-usecases-A1-policy-enforcement-upstream-jobs.yaml b/jjb/onap/integration-usecases-A1-policy-enforcement/integration-usecases-A1-policy-enforcement-upstream-jobs.yaml
new file mode 100644 (file)
index 0000000..15c695b
--- /dev/null
@@ -0,0 +1,27 @@
+---
+# ============LICENSE_START=======================================================
+#  Copyright (C) 2021 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=========================================================
+
+# this job gets triggered when push-upstream is commented on a change on Nordix Gerrit.
+- project:
+    name: integration-usecases-A1-policy-enforcement-upstream-jobs
+    project: integration/usecases/A1-policy-enforcement
+    project-name: integration-usecases-A1-policy-enforcement
+
+    jobs:
+      - 'onap-{project-name}-push-upstream'
index 3da71ed1e3e7d3213ce3c8db30efb4317c54432f..4bac5dbe9a218b282fbff79e612a6d96ded77f86 100644 (file)
@@ -43,7 +43,7 @@
       - nordix-gerrit-parameters
       - string:
           name: HELM_URL
-          default: 'https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz'
+          default: 'https://get.helm.sh/helm-v3.5.0-linux-amd64.tar.gz'
           description: Specifies the URL to fetch Helm.
       - string:
           name: HELM_PUSH_URL
             .modeling.enabled=true,
             .msb.enabled=true,
             .multicloud.enabled=true,
+            .multicloud.multicloud-starlingx.enabled=true,
+            .multicloud.multicloud-vio.enabled=true,
+            .multicloud.multicloud-windriver.enabled=true,
             .nbi.enabled=true,
             .oof.enabled=true,
             .platform.enabled=true,
index 6087f84caeed6e56f48c7565b2973dbde84aa640..53874360aedaf1e3cd083fdaf68fb664f65bc229 100644 (file)
@@ -30,6 +30,9 @@
       - 'master':
           branch: '{stream}'
           jdk-version: java-11
+      - 'istanbul':
+          branch: '{stream}'
+          jdk-version: java-11
       - '20.2':
           branch: '{stream}'
           jdk-version: java-11
index 8a0fa35f1e525c2d897ca77996439415817850d2..95a4f4d418839d6e01e764f588958e5b90d8c8b0 100644 (file)
@@ -1,6 +1,6 @@
 - job-template:
     name: 'oransc-{project-name}-verify-java'
-    node: oransc-ubuntu1804
+    node: oransc-ubuntu2004
     disabled: false
     concurrent: true
 
           name: MVN
           default: $WORKSPACE/apache-maven-${{MVN_VERSION}}/bin/mvn
           description: Path to mvn executable
+      - string:
+          name: GO_PATH
+          default: '/usr/local/go/bin'
+          description: Path to go executable
 
     scm:
       - git-scm-gerrit:
index b9af93be0cb73d9359cf469cb0c828065ec958dc..0e7dbdc33bafb0301502ad42237fb0100687eb03 100755 (executable)
@@ -3,17 +3,72 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-cd ${WORKSPACE}
+cd $WORKSPACE
+echo "Info: Update Java alternatives"
+echo "----------------------------------------------------"
+sudo /usr/bin/update-alternatives --install /usr/bin/java java "${JAVA_HOME}/bin/java" 1
+sudo /usr/bin/update-alternatives --install /usr/bin/javac javac "${JAVA_HOME}/bin/javac" 1
+sudo /usr/bin/update-alternatives --install /usr/bin/javadoc javadoc "${JAVA_HOME}/bin/javadoc" 1
+sudo /usr/bin/update-alternatives --install /usr/bin/jconsole jconsole "${JAVA_HOME}/bin/jconsole" 1
+sudo /usr/bin/update-alternatives --install /usr/lib/jvm/java-openjdk java_sdk_openjdk "${JAVA_HOME}" 1
+sudo /usr/bin/update-alternatives --set java "${JAVA_HOME}/bin/java"
+sudo /usr/bin/update-alternatives --set javac "${JAVA_HOME}/bin/javac"
+sudo /usr/bin/update-alternatives --set javadoc "${JAVA_HOME}/bin/javadoc"
+sudo /usr/bin/update-alternatives --set jconsole "${JAVA_HOME}/bin/jconsole"
+sudo /usr/bin/update-alternatives --set java_sdk_openjdk "${JAVA_HOME}"
 echo "Info: Java version"
 echo "----------------------------------------------------"
-${JAVA_HOME}/bin/java -version
+echo -e "\tJava version: $(java -version 2>&1 |  head -n 1)"
+echo -e "\tJava compiler version: $(javac -version)"
+echo -e "\tJAVA_HOME set to: ${JAVA_HOME}"
 echo "----------------------------------------------------"
 echo "Downloading Maven $MVN_VERSION from $MVN_URL"
 wget -q $MVN_URL && unzip -qq apache-maven-${MVN_VERSION}-bin.zip
 echo "Info: Maven version"
 echo "----------------------------------------------------"
-${MVN} -version
+$MVN -version
+echo "----------------------------------------------------"
+echo "Downloading ONAP Maven XML for build process from oparent repo"
+echo "----------------------------------------------------"
+git clone "https://git.onap.org/oparent" $WORKSPACE/oparent
+cd $WORKSPACE/oparent
+# Check if a commitid parameter is given to specify a version of
+# oparent repository to checkout. If commitid is not provided, the
+# latest master version is used as default for backward
+# compatibility for existing ONAP jobs.
+set +o nounset
+if [[ -v ${MVN_SETTINGS_XML_VERSION} ]]; then
+  git checkout "${MVN_SETTINGS_XML_VERSION}"
+fi
+set -o nounset
+
+# if MVN_PARAMS set then use them otherwise default to ""
+LOCAL_MVN_PARAMS=""
+set +o nounset
+if [[ -n ${MVN_PARAMS} ]]; then
+  LOCAL_MVN_PARAMS=${MVN_PARAMS}
+fi
+set -o nounset
+
+# Copy Onap maven settings.xml to Jenkins home directory
+if [ ! -d /home/jenkins/.m2 ]; then
+  mkdir -p /home/jenkins/.m2/
+fi
+cp settings.xml /home/jenkins/.m2/settings.xml
+cd $WORKSPACE
+
+POMFILE="-f $WORKSPACE/pom.xml"
+set +o nounset
+if [[ -n ${SUBDIRECTORY} ]]; then
+  POMFILE="-f $WORKSPACE/$SUBDIRECTORY/pom.xml"
+  echo "Setting pom.xml to use to $POMFILE"
+fi
+set -o nounset
+
+# Set PATH to go executable
+export PATH=${PATH}:${GO_PATH}
+
 echo "----------------------------------------------------"
 echo "Proceeding with unit test"
 echo "----------------------------------------------------"
-${MVN} clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
\ No newline at end of file
+$MVN clean install -U -B $POMFILE -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $LOCAL_MVN_PARAMS