Merge "Set prometheus monitoring for feature tests"
authorFurkat Gofurov <furkat.gofurov@est.tech>
Thu, 28 Oct 2021 20:01:30 +0000 (20:01 +0000)
committerNordix Gerrit <gerrit@nordix.org>
Thu, 28 Oct 2021 20:01:30 +0000 (20:01 +0000)
44 files changed:
jjb/airship/job_airship_integration_test_centos.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_v1a5_e2e_tests_centos.yml
jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml
jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml [new file with mode: 0644]
jjb/airship/job_capi_capm3_v1a5_master_e2e_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_image_building.yml
jjb/airship/job_openstack_node_image_building.yml
jjb/airship/projects.yml
jjb/cloud-infra/engine-jobs/engine-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/geode/apache-geode-test-coordinator.yaml
jjb/global/jjb-macros.yaml
jjb/onap/integration-seccom/integration-seccom-push-upstream-jobs.yaml [new file with mode: 0644]
jjb/onap/integration-seccom/integration-seccom-rebase-jobs.yaml [new file with mode: 0644]
jjb/onap/sdc/sdc-verify-jobs.yaml

index 716ee0bb4598563063c2b09f1d81436c6682e5bf..24fcaefaae060699905ff0272e2043b129075bca 100644 (file)
@@ -99,6 +99,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-integration-airship-centos"
         success-status: "Passed"
         failure-status: "Failed"
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..c4772fd
--- /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 v1alpha5 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: 'v1alpha4'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1alpha5'
+        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..b7b84ee
--- /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 v1alpha5 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: 'v1alpha4'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1alpha5'
+        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 238b91e3f57c17a869a23a0ea5fdffe926ad6545..b07ee528b65123319e628999444b02f6dc6179ff 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -99,6 +99,7 @@
         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 671345d006a354133128e7b3f34ddf751b0eaf80..96fa2022b8856d5bb019c1849721026625df96b0 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -99,6 +99,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
           - 'release-0.4'
           - 'release-0.0'
         status-context: "test-v1a4-integration"
index 16903f5a387c2eac39d4ecd5b5db02cc8f7390cc..424f1e67e59aec694613314d4f04c485db8e8580 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "0 4 * * *"
 
     pipeline-scm:
       scm:
index 9bd4b4d6d1e3e9361e6019b8a6ef4a9adb852ff6..8fb68ae6aa93ecc65a0565cb23a2eed53a39eec7 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "15 4 * * *"
 
     pipeline-scm:
       scm:
index 3929242febb282f3ebfb40c6aa478915b3cbbe1b..d77893e1e2e66506264442fb6024890ef50c7ad7 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -99,6 +99,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-centos-integration"
         success-status: "Passed"
         failure-status: "Failed"
index 90290a216972387465cde6b55e1eac1689411ba9..4c1d1565e1b287dc3e0891aacef7563e76859c65 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -99,6 +99,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-integration"
         success-status: "Passed"
         failure-status: "Failed"
index 8daae8b9dd4667d45f8229e2e086b64d0dc6c751..9189cbe08b2ac260f8721625e23703522932cc67 100644 (file)
@@ -73,7 +73,7 @@
         name: TARGET_NODE_MEMORY
         default: 4096
         description: 'RAM size of the target host.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "30 4 * * *"
 
     pipeline-scm:
       scm:
index 97b99473788efd76fb3020b3e707ff546be1dd2e..3f96a17a8e7c2300af6a1bf7cfa7ab54ae9198e9 100644 (file)
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "45 4 * * *"
 
     pipeline-scm:
       scm:
index 7afd3a2943a096b130bfde183995d68788f51d8a..19adc874ec93cbf9b9eba4dda70efd48bbe07f4d 100644 (file)
@@ -77,7 +77,7 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-v1a5-centos-e2e"
         success-status: "Passed"
         failure-status: "Failed"
index 4306994c8c0bcacb0d5246d9eaff084de7ac1386..a2e5c7b9371f363392cfa2ec2f402bca3a19cf7b 100644 (file)
@@ -77,7 +77,7 @@
         name: TESTS_FOR
         default: "e2e_tests"
         description: 'Tests using the e2e framework.'
-
+        
     properties:
     - build-discarder:
         days-to-keep: 30
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
         status-context: "test-v1a5-e2e"
         success-status: "Passed"
         failure-status: "Failed"
diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
new file mode 100644 (file)
index 0000000..d99a905
--- /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_v1a5_master_e2e_tests_centos
+    name: '{job_prefix}_master_e2e_test_centos'
+    description: "CAPM3 v1alpha5 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: 'v1alpha4'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1alpha5'
+        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_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
new file mode 100644 (file)
index 0000000..6f8ce00
--- /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_v1a5_master_e2e_tests_ubuntu
+    name: '{job_prefix}_master_e2e_test_ubuntu'
+    description: "CAPM3 v1alpha5 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: 'v1alpha4'
+        description: 'Cluster API version.'
+    - string:
+        name: CAPM3_VERSION
+        default: 'v1alpha5'
+        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
index 097740b7ff618216ef8575b4c0bb4832f7f1da12..88a3af3d418ee8c6893e64f9cffba709192ece86 100644 (file)
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
           - 'release-0.4'
         status-context: "test-features-centos"
         success-status: "Passed"
index 2dab46d44b0123d6b894bbecec33af4f77285e32..c3037227baa44d853d9d6bc4f020413c6c7c93a2 100644 (file)
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
           - 'release-0.4'
         status-context: "test-features"
         success-status: "Passed"
index 168a29cd1051de3dd9ef3e51963c61efb7e066eb..b64d50b35aca34289176a3c8c2c529da442db5eb 100644 (file)
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
+          - 'main'
           - 'release-0.4'
         status-context: "test-upgrade-features"
         success-status: "Passed"
index d2752e8fa5f342b525a025932ad20b46a66f446f..98ed4189c96bc2b0be64684ab2de2b5046b0d3fd 100644 (file)
         default: ''
         description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
     - string:
-        name: IPA_REPO_REF
+        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 code branch'
+        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'
         description: 'Configures IPA builder upload mode (staging/review)'
 
     properties:
+    - github:
+        url: https://github.com/Nordix/ironic-python-agent.git
     - build-discarder:
         days-to-keep: 30
         num-to-keep: 300
@@ -54,7 +96,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "0 */48 * * *"
+      - timed: "0 4  * * 1,3,5,7"
       - github
 
     pipeline-scm:
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 8eb26ce595796b7d989f9c38ebb60ef26da01874..b55eaad89e55efb2b6d6e5378079add314ab2998 100644 (file)
@@ -94,7 +94,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "H 17 * * *"
 
     pipeline-scm:
       scm:
index 8eef91e29bb4cf94e288d246185c5b5de91d3280..c9ef2df4cc8fadca77f47cc10615ec5d5683de64 100644 (file)
@@ -94,7 +94,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "@midnight"
+      - timed: "H 17 * * *"
 
     pipeline-scm:
       scm:
index db260b1f4209fd50b65bc43f41c6b7318f87a2c6..729cab0612fc0073a7a118a833f82ca7d206e2ed 100644 (file)
@@ -94,7 +94,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H H(21-23) * * *"
+      - timed: "H 17 * * *"
 
     pipeline-scm:
       scm:
index 6261f518e714d87f347c7ba08094e2ef434f5605..8efeb5980544dbe2f4f37527d2f9fcb553565b4b 100644 (file)
     defaults: global
     disabled: False
     concurrent: True
+    parameters:
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+    - string:
+        name: KIND_NODE_IMAGE_VERSION
+        default: "v1.22.0"
+        description: 'Kind node container image version'
 
     properties:
     - build-discarder:
index 42f1a7d9c3fbf47548790aa53d5068b84d840618..8e257ee83acabe8c38ea16f627b7f7db75a491ec 100644 (file)
     defaults: global
     disabled: False
     concurrent: True
-
+    parameters:
+    - string:
+        name: KUBERNETES_VERSION
+        default: "v1.22.0"
+        description: 'Kubernetes version'
+  
     properties:
     - build-discarder:
         days-to-keep: 30
index 48cecb10746e1d9a452e25c9ca6c69388dedb045..c16cf95e36865a44a76941faabd89faf85b778b5 100644 (file)
     ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
     ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
 
-- project:
-    name: 'nordix_metal3_dev_env'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    jobs:
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
-    repo:
-      org: "Nordix"
-      name: "metal3-dev-env"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
-
-- project:
-    name: 'nordix_bmo'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    jobs:
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
-    repo:
-      org: "Nordix"
-      name: "baremetal-operator"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
-
-- project:
-    name: 'nordix_capi_m3'
-    branch: '${{ghprbActualCommit}}'
-    ci_github_whitelist_org:
-    - nordix-airship
-    jobs:
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
-    repo:
-      org: "Nordix"
-      name: "cluster-api-provider-metal3"
-    ci_github_jenkins_credentials_id: 'nordix-airship-ci-github-prod-token'
-    ci_ghprb_auth_id: 'e8a43847-46ff-42db-a5db-7366df0e4ee2'
-    ci_github_repo: 'https://github.com/Nordix/airship-dev-tools.git'
-
 - project:
     name: 'metal3io_project_infra'
     branch: '${{ghprbActualCommit}}'
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
+    - bml_integration_tests_centos
 
 - project:
     name: 'metal3io_project_infra_cleanup'
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
     - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
 
 - project:
     name: "metal3io_ipam"
     - 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_v1a5_integration_tests_ubuntu
     - capi_capm3_v1a5_e2e_tests_ubuntu
     - capi_capm3_v1a5_e2e_tests_centos
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
+    - capi_capm3_v1a5_master_e2e_tests_ubuntu
+    - capi_capm3_v1a5_master_e2e_tests_centos
+
 
 - project:
     name: "metal3io_ironic_image"
     - capi_bm_v1a4_integration_tests_ubuntu
     - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
 
 - project:
     name: "metal3io_ironic_ipa_downloader"
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
     - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
     - capi_bm_v1a5_integration_tests_ubuntu
-    - feature_tests_ubuntu
-    - feature_tests_centos
-    - feature_tests_upgrade_ubuntu
index c294376673b97933e9e258071700e8e8522cae41..f58c35c066f7e22a63beb6a092a84617feccbe89 100644 (file)
             - shell: |
                 #!/bin/bash
                 sudo chown -R $USER:$USER $WORKSPACE || exit 1
-
+      - ssh-agent-credentials:
+          users:
+            - 'city-nordix-jenkins-ssh'
 
     builders:
       - 'generate-change-metadata-macro'
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 bd8cc5991f095112be5871db93a85ffaacb68f1e..abcb532872345d00941d995d7b96beffdb834e64 100644 (file)
@@ -22,8 +22,8 @@
     project: 'Nordix/geode'
 
     stream:
-      - 'release-nordix-1.13.0':
-          branch: 'release-nordix/1.13.0'
+      - 'release-nordix-1.14.0':
+          branch: 'release-nordix/1.14.0'
     jobs:
       - 'apache-geode-verify-{stream}-coordinator'
 
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-seccom/integration-seccom-push-upstream-jobs.yaml b/jjb/onap/integration-seccom/integration-seccom-push-upstream-jobs.yaml
new file mode 100644 (file)
index 0000000..d5617d3
--- /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-seccom-push-upstream
+    project: integration/seccom
+    project-name: integration-seccom
+
+    jobs:
+      - 'onap-{project-name}-push-upstream'
diff --git a/jjb/onap/integration-seccom/integration-seccom-rebase-jobs.yaml b/jjb/onap/integration-seccom/integration-seccom-rebase-jobs.yaml
new file mode 100644 (file)
index 0000000..5f30efb
--- /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/seccom project on ONAP Gerrit.
+
+- project:
+    name: integration-seccom-rebase
+    project: integration/seccom
+    project-name: integration-seccom
+
+    jobs:
+      - 'onap-{project-name}-rebase'
\ No newline at end of file
index d5bd595670602e61e428901f2e610be179d4f930..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
@@ -42,5 +45,8 @@
       - '21.2':
           branch: '{stream}'
           jdk-version: java-11
+      - '21.4':
+          branch: '{stream}'
+          jdk-version: java-11
     jobs:
       - 'onap-{project-name}-{stream}-verify-java'