Add node image buidling pipeline
Also:
- Set image builing every 14 days
- Improve ci image building pipeline
- Fix e2e tests pipeline name
- Remove dev tools integration tests
Change-Id: Iaef9727c924e9408eb70afeebc203f46a4cb7699
Signed-off-by: Sunnatillo <sunnat.samadov@est.tech>
diff --git a/jjb/metal3/defaults.yml b/jjb/metal3/defaults.yml
index f24c7f8..96cd585 100644
--- a/jjb/metal3/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -32,11 +32,12 @@
- metal3-io
- nordix-metal3
ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
+ ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
e2e_feature_test_parallel_pipeline: 'jenkins/jobs/parallel_e2e_features_test.pipeline'
- e2e_feature_test_pipeline: 'jenkins/jobs/capm3-e2e-tests.pipeline'
- ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'
+ e2e_tests_pipeline: 'jenkins/jobs/capm3-e2e-tests.pipeline'
dev_env_integration_test_pipeline: 'jenkins/jobs/dev_env_integration_tests.pipeline'
+ image_building_pipeline: 'jenkins/jobs/image_building.pipeline'
# NOTE: auth-id is taken from Jenkins Global Configuration (NOT THE CREDENTIAL STORE!)
# by clicking Auth ID button for the desired GitHub Server API URL
# Please ensure you are looking at GitHub Pull Request Builder part
diff --git a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
index d535210..c360e2a 100644
--- a/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
@@ -104,5 +104,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{e2e_feature_test_pipeline}"
+ script-path: "{e2e_tests_pipeline}"
lightweight-checkout: False
diff --git a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index e351b15..0666dfa 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -107,5 +107,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- script-path: "{e2e_feature_test_pipeline}"
+ script-path: "{e2e_tests_pipeline}"
lightweight-checkout: False
diff --git a/jjb/metal3/job_ci_image_building.yml b/jjb/metal3/job_ci_image_building.yml
index 5b1107b..cbbeead 100644
--- a/jjb/metal3/job_ci_image_building.yml
+++ b/jjb/metal3/job_ci_image_building.yml
@@ -26,12 +26,17 @@
- job-template:
id: ci_image_building
- name: '{job_prefix}_ci_image_building'
+ name: '{job_prefix}_periodic_ci_image_building'
description: "Builder job for CI images for Metal3 CI"
project-type: pipeline
defaults: global
disabled: False
concurrent: True
+ parameters:
+ - string:
+ name: IMAGE_TYPE
+ default: 'ci'
+ description: 'Specifies the type of image being built in pipeline'
properties:
- build-discarder:
@@ -41,7 +46,7 @@
artifact-num-to-keep: -1
triggers:
- - timed: "0 5 */5 * *"
+ - timed: "0 6 */14 * *"
pipeline-scm:
scm:
diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
deleted file mode 100644
index 031698a..0000000
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ /dev/null
@@ -1,121 +0,0 @@
----
-#
-# ============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 Cluster API Provider Metal3 (CAPM3)
-# dev tools 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 Nordix/metal3-dev-tools repository.
-
-- job-template:
- id: metal3_dev_tools_integration_test
- name: 'metal3_dev_tools_integration_test_{image_os}'
- description: "CAPM3 v1beta1 metal3-dev-tools integration tests for {repo[org]}/{repo[name]} on {image_os}."
- 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: 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: 'v1beta1'
- description: 'Cluster API version. E.g. v1beta1.'
- - string:
- name: CAPM3_VERSION
- default: 'v1beta1'
- description: 'Cluster API provider Metal3 version. E.g. v1beta1.'
- - string:
- name: TARGET_NODE_MEMORY
- default: 4096
- description: 'RAM size of the target host.'
- - string:
- name: KUBERNETES_VERSION
- default: ""
- description: 'Kubernetes version'
-
- 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: '.*?/test-integration-metal3-dev-tools-{image_os}.*?'
- 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:
- - 'main'
- status-context: "test-integration-metal3-dev-tools-{image_os}"
- 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: 'ci/jobs/metal3_dev_tools_integration_tests.pipeline'
- lightweight-checkout: False
diff --git a/jjb/metal3/job_openstack_node_image_building.yml b/jjb/metal3/job_node_image_building.yml
similarity index 86%
rename from jjb/metal3/job_openstack_node_image_building.yml
rename to jjb/metal3/job_node_image_building.yml
index 38f7835..b3c6b6a 100644
--- a/jjb/metal3/job_openstack_node_image_building.yml
+++ b/jjb/metal3/job_node_image_building.yml
@@ -26,15 +26,19 @@
# NOTE: KUBERNETES_VERSION and KUBECTL_SHA256 are changed as a pair
- job-template:
- id: openstack_node_image_building
- name: '{job_prefix}_openstack_node_image_building'
- description: "Builder job for Openstack node images for Metal3 CI"
+ id: node_image_building
+ name: '{job_prefix}_periodic_node_image_building'
+ description: "Builder job for node images for Metal3 CI"
project-type: pipeline
defaults: global
disabled: False
concurrent: True
parameters:
- string:
+ name: IMAGE_TYPE
+ default: 'node'
+ description: 'Specifies the type of image being built in pipeline'
+ - string:
name: KUBERNETES_VERSION
default: "v1.30.0"
description: 'Kubernetes version'
@@ -58,6 +62,9 @@
artifact-days-to-keep: -1
artifact-num-to-keep: -1
+ triggers:
+ - timed: "0 5 */14 * *"
+
pipeline-scm:
scm:
- git:
@@ -70,8 +77,5 @@
wipe-workspace: True
honor-refspec: True
shallow-clone: False
- included-regions:
- - "ci/images/.*"
- - "ci/scripts/image_scripts/.*"
- script-path: 'ci/jobs/{id}.pipeline'
+ script-path: 'jenkins/jobs/{id}.pipeline'
lightweight-checkout: False
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index f8cc38b..81151c8 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -34,16 +34,10 @@
ci_github_whitelist_org:
- nordix-metal3
jobs:
- - openstack_image_building
- - openstack_node_image_building
- docker_image_building
- update_nordix_repos
- periodic_fullstack_building
- fullstack_building_test
- - metal3_dev_tools_integration_test:
- image_os:
- - ubuntu
- - centos
- artifact_cleanup
repo:
org: "Nordix"
@@ -56,6 +50,7 @@
name: 'image_building'
jobs:
- ci_image_building
+ - node_image_building
- project:
name: integration-tests