Add node image buidling pipeline 20/21020/5
authorSunnatillo <sunnat.samadov@est.tech>
Tue, 30 Apr 2024 11:37:23 +0000 (14:37 +0300)
committerSunnatillo <sunnat.samadov@est.tech>
Thu, 2 May 2024 06:39:35 +0000 (09:39 +0300)
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>
jjb/metal3/defaults.yml
jjb/metal3/job_capm3_e2e_clusterctl_upgrade_tests_prow.yml
jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
jjb/metal3/job_ci_image_building.yml
jjb/metal3/job_metal3_dev_tools_integration_test.yml [deleted file]
jjb/metal3/job_node_image_building.yml [moved from jjb/metal3/job_openstack_node_image_building.yml with 86% similarity]
jjb/metal3/projects.yml

index f24c7f89cdb3a9728c257e01fa26631ba8a7e61c..96cd585720ecfd8cd58472f94e718f45cb229b52 100644 (file)
     - 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
index d5352105be8461e783086f014470946bcefa4d74..c360e2a67ccddc9eae7f269674632a44a33c2e1c 100644 (file)
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "{e2e_feature_test_pipeline}"
+      script-path: "{e2e_tests_pipeline}"
       lightweight-checkout: False
index e351b155fef9517f736d48b8e3a8d3ee8c5ba4a4..0666dfaec86e6cee665e7cfa677f57c38fc69353 100644 (file)
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: "{e2e_feature_test_pipeline}"
+      script-path: "{e2e_tests_pipeline}"
       lightweight-checkout: False
index 5b1107bf3b0f669e8587c45942736cf1ec3e2ca0..cbbeead632c786a288716b6faec64cb54f8eec7c 100644 (file)
 
 - 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 (file)
index 031698a..0000000
+++ /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
similarity index 86%
rename from jjb/metal3/job_openstack_node_image_building.yml
rename to jjb/metal3/job_node_image_building.yml
index 38f7835a1bfd1566b997f102fa45bd78296e1d25..b3c6b6a8ac58bee3f5b6e6887285f1bcec110bbe 100644 (file)
 # 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"
@@ -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
index f8cc38b83413e592725c7327ab749c083a7c8188..81151c84f5f0a9bacd69751a06a30b658ded68d0 100644 (file)
     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