From: Sunnatillo Date: Thu, 18 Apr 2024 11:51:24 +0000 (+0300) Subject: fix naming on dev env integration tests and remove ghprb based dev env integration... X-Git-Url: https://gerrit.nordix.org/gitweb?p=infra%2Fcicd.git;a=commitdiff_plain;h=7e4633b01bdcda0663b4dba70288652c59ee7469 fix naming on dev env integration tests and remove ghprb based dev env integration tests Change-Id: Icc27b46b650d07ba56980deef626f23e36b2d27b Signed-off-by: Sunnatillo --- diff --git a/jjb/metal3/job_dev_env_integration_tests.yml b/jjb/metal3/job_dev_env_integration_tests.yml deleted file mode 100644 index 4000bb6c8..000000000 --- a/jjb/metal3/job_dev_env_integration_tests.yml +++ /dev/null @@ -1,133 +0,0 @@ ---- -# -# ============LICENSE_START======================================================= -# Copyright (C) 2024 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 Cluster API Provider Metal3 (CAPM3) 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 Metal3 CI project infra repository. - -- job-template: - id: dev_env_integration_tests - name: '{job_prefix}_{proj}_{capm3_target_branch}_dev_env_integration_test_{image_os}{name_postfix}' - description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os} with ironic installed from {ironic_install_type}." - project-type: pipeline - defaults: integration-default-values - disabled: False - concurrent: True - parameters: - - string: - name: PROJECT_REPO_ORG - default: '{org}' - description: 'Project github repo org name' - - string: - name: PROJECT_REPO_NAME - default: '{repo}' - 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/{org}/{repo}.git' - description: 'CI Repo URL for triggering manual build' - - string: - name: ghprbTargetBranch - default: 'main' - description: 'Target branch of the PR' - - string: - name: capm3_release_branch - default: '{capm3_release_branch}' - description: 'The target branch of CAPM3 to be used for this test' - - string: - name: bmo_release_branch - default: '{bmo_release_branch}' - description: 'The target branch of BMO to be used for this test' - - string: - name: IMAGE_OS - default: '{image_os}' - description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos' - - string: - name: CAPI_VERSION - default: '{capi_version}' - description: 'Cluster API version.' - - string: - name: CAPM3_VERSION - default: '{capm3_version}' - description: 'Cluster API provider Metal3 version.' - - string: - name: TARGET_NODE_MEMORY - default: 4096 - description: 'RAM size of the target host.' - - string: - name: IRONIC_INSTALL_TYPE - default: '{ironic_install_type}' - description: 'Sets the installation type of ironic during ironic-image build of the BMO deployment' - - string: - name: IRONIC_USE_MARIADB - default: '{ironic_use_mariadb}' - description: 'If Ironic should use MariaDB or not.' - - string: - name: BUILD_MARIADB_IMAGE_LOCALLY - default: '{build_mariadb_image_locally}' - 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/{org}/{repo} - - 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: '.*?/test-{image_os}-dev-env-integration-{capm3_target_branch}{trigger_postfix}.*?' - 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: "{target_branches}" - status-context: "test-{image_os}-dev-env-integration-{capm3_target_branch}" - 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|main}' - name: 'origin' - refspec: '+refs/heads/*:refs/remotes/origin/*' - wipe-workspace: True - honor-refspec: True - shallow-clone: False - script-path: "{dev_env_integration_test_pipeline}" - lightweight-checkout: False diff --git a/jjb/metal3/job_dev_env_integration_tests_prow.yml b/jjb/metal3/job_dev_env_integration_tests_prow.yml index ab0ef7926..323edd9c4 100644 --- a/jjb/metal3/job_dev_env_integration_tests_prow.yml +++ b/jjb/metal3/job_dev_env_integration_tests_prow.yml @@ -26,7 +26,7 @@ - job-template: id: dev_env_integration_tests_prow - name: 'dev_env_integration_test_{image_os}_{capm3_target_branch}_{name_postfix}' + name: 'dev-env-integration-test-{image_os}-{capm3_target_branch}{name_postfix}' description: "CAPM3 {capm3_version} integration tests on {image_os} with ironic installed from {ironic_install_type}." project-type: pipeline defaults: integration-default-values diff --git a/jjb/metal3/job_dev_env_main_integration_tests_prow.yaml b/jjb/metal3/job_dev_env_periodic_integration_tests_prow.yaml similarity index 97% rename from jjb/metal3/job_dev_env_main_integration_tests_prow.yaml rename to jjb/metal3/job_dev_env_periodic_integration_tests_prow.yaml index 0113fc933..568bc949c 100644 --- a/jjb/metal3/job_dev_env_main_integration_tests_prow.yaml +++ b/jjb/metal3/job_dev_env_periodic_integration_tests_prow.yaml @@ -26,7 +26,7 @@ - job-template: id: dev_env_periodic_integration_tests_prow - name: 'dev_env_periodic_integration_test_{image_os}_{capm3_target_branch}_{name_postfix}' + name: 'dev-env-periodic-integration-test-{image_os}-{capm3_target_branch}{name_postfix}' description: "CAPM3 {capm3_version} integration tests on {image_os} with ironic installed from {ironic_install_type}." project-type: pipeline defaults: integration-default-values diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml index edd1133ba..9e5dc5850 100644 --- a/jjb/metal3/projects.yml +++ b/jjb/metal3/projects.yml @@ -1008,74 +1008,6 @@ ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a' ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git' -- project: - name: dev-env-integration-tests - org: metal3-io - proj: - - metal3_dev_env: - repo: metal3-dev-env - - project_infra: - repo: project-infra - branch: '${{ghprbActualCommit}}' - ci_github_repo: '${{ghprbAuthorRepoGitUrl}}' - - capm3: - repo: cluster-api-provider-metal3 - - bmo: - repo: baremetal-operator - - ipam: - repo: ip-address-manager - - ironic_image: - repo: ironic-image - name_postfix: '_ironic_from_source' - trigger_postfix: '-ironic-source' - ironic_install_type: 'source' - - ironic_ipa_downloader: - repo: ironic-ipa-downloader - - mariadb_image: - repo: mariadb-image - build_mariadb_image_locally: 'true' - ironic_use_mariadb: 'true' - image_os: - - ubuntu - - centos - capm3_target_branch: - - main: - capi_version: v1beta1 - capm3_version: v1beta1 - capm3_release_branch: main - bmo_release_branch: main - target_branches: - - 'main' - - release-1-6: - capi_version: v1beta1 - capm3_version: v1beta1 - capm3_release_branch: release-1.6 - bmo_release_branch: release-0.5 - target_branches: - - 'main' - - 'release-1.6' - - 'release-0.5' - - release-1-5: - capi_version: v1beta1 - capm3_version: v1beta1 - capm3_release_branch: release-1.5 - bmo_release_branch: release-0.4 - target_branches: - - 'main' - - 'release-1.5' - - 'release-0.4' - - release-1-4: - capi_version: v1beta1 - capm3_version: v1beta1 - capm3_release_branch: release-1.4 - bmo_release_branch: release-0.3 - target_branches: - - 'main' - - 'release-1.4' - - 'release-0.3' - jobs: - - dev_env_integration_tests - - project: name: dev-env-integration-tests-prow org: metal3-io