From: Furkat Gofurov Date: Thu, 28 Oct 2021 20:01:30 +0000 (+0000) Subject: Merge "Set prometheus monitoring for feature tests" X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=a8cfafba77c7c752c40bd4180dface6ec593da24;hp=f51ae448d8bdf7ebeda6549e0572f8466abecd40;p=infra%2Fcicd.git Merge "Set prometheus monitoring for feature tests" --- diff --git a/jjb/airship/job_airship_integration_test_centos.yml b/jjb/airship/job_airship_integration_test_centos.yml index 716ee0bb..24fcaefa 100644 --- a/jjb/airship/job_airship_integration_test_centos.yml +++ b/jjb/airship/job_airship_integration_test_centos.yml @@ -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 index 00000000..c4772fde --- /dev/null +++ b/jjb/airship/job_bml_integration_tests_centos.yml @@ -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 index 00000000..b7b84ee5 --- /dev/null +++ b/jjb/airship/job_bml_master_integration_tests_centos.yml @@ -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 diff --git a/jjb/airship/job_capi_bm_unit_tests.yml b/jjb/airship/job_capi_bm_unit_tests.yml index 55c9ecef..46cb37ba 100644 --- a/jjb/airship/job_capi_bm_unit_tests.yml +++ b/jjb/airship/job_capi_bm_unit_tests.yml @@ -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" diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml index 238b91e3..b07ee528 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml @@ -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" diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml index 671345d0..96fa2022 100644 --- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml @@ -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" diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml index 16903f5a..424f1e67 100644 --- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml @@ -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: diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml index 9bd4b4d6..8fb68ae6 100644 --- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml @@ -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: diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml index 3929242f..d77893e1 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml @@ -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" diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml index 90290a21..4c1d1565 100644 --- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml @@ -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" diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml index 8daae8b9..9189cbe0 100644 --- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml +++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml @@ -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: diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml index 97b99473..3f96a17a 100644 --- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml +++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml @@ -82,7 +82,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "45 4 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml index 7afd3a29..19adc874 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml +++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_centos.yml @@ -77,7 +77,7 @@ name: TESTS_FOR default: "e2e_tests" description: 'Tests using the e2e framework.' - + properties: - build-discarder: days-to-keep: 30 @@ -103,6 +103,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' + - 'main' status-context: "test-v1a5-centos-e2e" success-status: "Passed" failure-status: "Failed" diff --git a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml index 4306994c..a2e5c7b9 100644 --- a/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml +++ b/jjb/airship/job_capi_capm3_v1a5_e2e_tests_ubuntu.yml @@ -77,7 +77,7 @@ name: TESTS_FOR default: "e2e_tests" description: 'Tests using the e2e framework.' - + properties: - build-discarder: days-to-keep: 30 @@ -103,6 +103,7 @@ 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 index 00000000..d99a9054 --- /dev/null +++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml @@ -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 index 00000000..6f8ce00c --- /dev/null +++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml @@ -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 diff --git a/jjb/airship/job_feature_tests_centos.yml b/jjb/airship/job_feature_tests_centos.yml index 097740b7..88a3af3d 100644 --- a/jjb/airship/job_feature_tests_centos.yml +++ b/jjb/airship/job_feature_tests_centos.yml @@ -111,6 +111,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' + - 'main' - 'release-0.4' status-context: "test-features-centos" success-status: "Passed" diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml index 2dab46d4..c3037227 100644 --- a/jjb/airship/job_feature_tests_ubuntu.yml +++ b/jjb/airship/job_feature_tests_ubuntu.yml @@ -111,6 +111,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' + - 'main' - 'release-0.4' status-context: "test-features" success-status: "Passed" diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml index 168a29cd..b64d50b3 100644 --- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml +++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml @@ -111,6 +111,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' + - 'main' - 'release-0.4' status-context: "test-upgrade-features" success-status: "Passed" diff --git a/jjb/airship/job_ipa_image_building.yml b/jjb/airship/job_ipa_image_building.yml index d2752e8f..98ed4189 100644 --- a/jjb/airship/job_ipa_image_building.yml +++ b/jjb/airship/job_ipa_image_building.yml @@ -38,15 +38,57 @@ 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: diff --git a/jjb/airship/job_ipa_image_building_test.yml b/jjb/airship/job_ipa_image_building_test.yml index 0e539c65..10d8b52f 100644 --- a/jjb/airship/job_ipa_image_building_test.yml +++ b/jjb/airship/job_ipa_image_building_test.yml @@ -33,6 +33,54 @@ 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]}' @@ -83,6 +131,7 @@ allow-whitelist-orgs-as-admins: True white-list-target-branches: - 'master' + - 'main' status-context: "test-ipa" success-status: "Passed" failure-status: "Failed" diff --git a/jjb/airship/job_linter_tests.yml b/jjb/airship/job_linter_tests.yml index b3259430..33900312 100644 --- a/jjb/airship/job_linter_tests.yml +++ b/jjb/airship/job_linter_tests.yml @@ -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" diff --git a/jjb/airship/job_master_feature_tests_centos.yml b/jjb/airship/job_master_feature_tests_centos.yml index 8eb26ce5..b55eaad8 100644 --- a/jjb/airship/job_master_feature_tests_centos.yml +++ b/jjb/airship/job_master_feature_tests_centos.yml @@ -94,7 +94,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "H 17 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/airship/job_master_feature_tests_ubuntu.yml index 8eef91e2..c9ef2df4 100644 --- a/jjb/airship/job_master_feature_tests_ubuntu.yml +++ b/jjb/airship/job_master_feature_tests_ubuntu.yml @@ -94,7 +94,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "@midnight" + - timed: "H 17 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml index db260b1f..729cab06 100644 --- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml +++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml @@ -94,7 +94,7 @@ artifact-num-to-keep: -1 triggers: - - timed: "H H(21-23) * * *" + - timed: "H 17 * * *" pipeline-scm: scm: diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/airship/job_openstack_image_building.yml index 6261f518..8efeb598 100644 --- a/jjb/airship/job_openstack_image_building.yml +++ b/jjb/airship/job_openstack_image_building.yml @@ -32,6 +32,15 @@ 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: diff --git a/jjb/airship/job_openstack_node_image_building.yml b/jjb/airship/job_openstack_node_image_building.yml index 42f1a7d9..8e257ee8 100644 --- a/jjb/airship/job_openstack_node_image_building.yml +++ b/jjb/airship/job_openstack_node_image_building.yml @@ -32,7 +32,12 @@ 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 diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml index 48cecb10..c16cf95e 100644 --- a/jjb/airship/projects.yml +++ b/jjb/airship/projects.yml @@ -50,54 +50,6 @@ 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}}' @@ -115,6 +67,7 @@ - feature_tests_ubuntu - feature_tests_centos - feature_tests_upgrade_ubuntu + - bml_integration_tests_centos - project: name: 'metal3io_project_infra_cleanup' @@ -138,8 +91,6 @@ - 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" @@ -169,6 +120,8 @@ - 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" @@ -186,9 +139,9 @@ - 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" @@ -200,9 +153,6 @@ - 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" @@ -210,10 +160,5 @@ 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 diff --git a/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml b/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml index c2943766..f58c35c0 100644 --- a/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml +++ b/jjb/cloud-infra/engine-jobs/engine-verify-package.yaml @@ -157,7 +157,9 @@ - shell: | #!/bin/bash sudo chown -R $USER:$USER $WORKSPACE || exit 1 - + - ssh-agent-credentials: + users: + - 'city-nordix-jenkins-ssh' builders: - 'generate-change-metadata-macro' diff --git a/jjb/cloud-infra/scripts/test-package.sh b/jjb/cloud-infra/scripts/test-package.sh index 8685c337..d9b9b532 100644 --- a/jjb/cloud-infra/scripts/test-package.sh +++ b/jjb/cloud-infra/scripts/test-package.sh @@ -21,19 +21,22 @@ 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: diff --git a/jjb/eiffel/etos-api.yaml b/jjb/eiffel/etos-api.yaml index 95095d34..d8c6c838 100644 --- a/jjb/eiffel/etos-api.yaml +++ b/jjb/eiffel/etos-api.yaml @@ -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' diff --git a/jjb/eiffel/etos-environment-provider-worker.yaml b/jjb/eiffel/etos-environment-provider-worker.yaml index bd53d6c4..5c471f5e 100644 --- a/jjb/eiffel/etos-environment-provider-worker.yaml +++ b/jjb/eiffel/etos-environment-provider-worker.yaml @@ -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' diff --git a/jjb/eiffel/etos-environment-provider.yaml b/jjb/eiffel/etos-environment-provider.yaml index 34a93c7f..25c230f0 100644 --- a/jjb/eiffel/etos-environment-provider.yaml +++ b/jjb/eiffel/etos-environment-provider.yaml @@ -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' diff --git a/jjb/eiffel/etos-suite-runner.yaml b/jjb/eiffel/etos-suite-runner.yaml index 72cf15b9..f70b9d7c 100644 --- a/jjb/eiffel/etos-suite-runner.yaml +++ b/jjb/eiffel/etos-suite-runner.yaml @@ -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' diff --git a/jjb/eiffel/etos-suite-starter.yaml b/jjb/eiffel/etos-suite-starter.yaml index 5e6ba2ba..6e0c8808 100644 --- a/jjb/eiffel/etos-suite-starter.yaml +++ b/jjb/eiffel/etos-suite-starter.yaml @@ -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' diff --git a/jjb/eiffel/etos-test-runner-containers-base.yaml b/jjb/eiffel/etos-test-runner-containers-base.yaml index 37eb8aa8..653b3ec5 100644 --- a/jjb/eiffel/etos-test-runner-containers-base.yaml +++ b/jjb/eiffel/etos-test-runner-containers-base.yaml @@ -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' diff --git a/jjb/eiffel/etos-test-runner-containers-go.yaml b/jjb/eiffel/etos-test-runner-containers-go.yaml index ca662012..7a8d67de 100644 --- a/jjb/eiffel/etos-test-runner-containers-go.yaml +++ b/jjb/eiffel/etos-test-runner-containers-go.yaml @@ -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' diff --git a/jjb/eiffel/etos-test-runner-containers-python.yaml b/jjb/eiffel/etos-test-runner-containers-python.yaml index ba184b8d..fd793a89 100644 --- a/jjb/eiffel/etos-test-runner-containers-python.yaml +++ b/jjb/eiffel/etos-test-runner-containers-python.yaml @@ -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' diff --git a/jjb/eiffel/etos-test-runner-containers-rust.yaml b/jjb/eiffel/etos-test-runner-containers-rust.yaml index a47154a0..18e62915 100644 --- a/jjb/eiffel/etos-test-runner-containers-rust.yaml +++ b/jjb/eiffel/etos-test-runner-containers-rust.yaml @@ -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' diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml index bd8cc599..abcb5328 100644 --- a/jjb/geode/apache-geode-test-coordinator.yaml +++ b/jjb/geode/apache-geode-test-coordinator.yaml @@ -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' diff --git a/jjb/global/jjb-macros.yaml b/jjb/global/jjb-macros.yaml index b971341c..b8536525 100644 --- a/jjb/global/jjb-macros.yaml +++ b/jjb/global/jjb-macros.yaml @@ -455,7 +455,7 @@ 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 index 00000000..d5617d38 --- /dev/null +++ b/jjb/onap/integration-seccom/integration-seccom-push-upstream-jobs.yaml @@ -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 index 00000000..5f30efb1 --- /dev/null +++ b/jjb/onap/integration-seccom/integration-seccom-rebase-jobs.yaml @@ -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 diff --git a/jjb/onap/sdc/sdc-verify-jobs.yaml b/jjb/onap/sdc/sdc-verify-jobs.yaml index d5bd5956..53874360 100644 --- a/jjb/onap/sdc/sdc-verify-jobs.yaml +++ b/jjb/onap/sdc/sdc-verify-jobs.yaml @@ -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'