Rename Airship folder and all other mentions of it to Metal3 and bml prefix to capm3

Change-Id: Iec3093938b305d008c7f302de3d8e5d26ac6f6c2

diff --git a/jjb/airship/job_capi_bm_unit_tests.yml b/jjb/airship/job_capi_bm_unit_tests.yml
deleted file mode 100644 (file)
index 46cb37b..0000000
--- a/jjb/airship/job_capi_bm_unit_tests.yml
+++ /dev/null
@@ -1,93 +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 K8s CAPI Baremetal 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 Airship CI repository.
-
-- job-template:
-    id: capi_bm_unit_tests
-    name: '{job_prefix}_{name}_unit_test'
-    description: "K8s CAPI baremetal unit tests for {repo[org]}/{repo[name]}. "
-    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'
-
-    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-unit'
-        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: "integration-tests"
-        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: 'ci/jobs/{id}.pipeline'
-      lightweight-checkout: False

diff --git a/jjb/airship/defaults.yml b/jjb/metal3/defaults.yml
similarity index 92%
rename from jjb/airship/defaults.yml
rename to jjb/metal3/defaults.yml
index e6b604e97e1eed5f978127947e6a12f7a6666c8e..884d641d4f0390badea8bc881d2056a9f351e49d 100644 (file)
--- a/jjb/airship/defaults.yml
+++ b/jjb/metal3/defaults.yml
@@ -21,16 +21,16 @@
 
 # Description:
 # ============
-# This file contains global default values for airship projects
+# This file contains global default values for metal3 projects
 
 # Project Defaults
 - defaults:
     name: global
-    job_prefix: 'airship'
+    job_prefix: 'metal3'
     ci_github_admin_user: 'nordixinfra'
     ci_github_whitelist_org:
     - metal3-io
-    - nordix-airship
+    - nordix-metal3
     ci_github_repo: 'https://github.com/metal3-io/project-infra.git'
     ci_github_pipeline: 'jenkins/jobs/integration_tests.pipeline'
     ci_github_jenkins_credentials_id: 'metal3-jenkins-github-username-token'

diff --git a/jjb/airship/job_artifactory_cleanup.yml b/jjb/metal3/job_artifactory_cleanup.yml
similarity index 96%
rename from jjb/airship/job_artifactory_cleanup.yml
rename to jjb/metal3/job_artifactory_cleanup.yml
index f9d1fa8d9eebfb2902d6281e4b3fba7452b7f7eb..deff01d70b8750c7479a3e83354f9e4565f85178 100644 (file)
--- a/jjb/airship/job_artifactory_cleanup.yml
+++ b/jjb/metal3/job_artifactory_cleanup.yml
@@ -22,7 +22,7 @@
 # ============
 # This file contains job template definition for nordix Artifacotry cleanup.
 # This job can be triggered manually. It creates a pipeline job.
-# The pipeline scripts are maintained in Nordix/airship-dev-tools repository.
+# The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: artifactory_cleanup

diff --git a/jjb/airship/job_bml_integration_tests_centos.yml b/jjb/metal3/job_bml_integration_tests_centos.yml
similarity index 92%
rename from jjb/airship/job_bml_integration_tests_centos.yml
rename to jjb/metal3/job_bml_integration_tests_centos.yml
index 2304a213c389efdcd858a55febfa5630efb106f5..252ea72987ba92759a652c1c107c17ae7b520bbd 100644 (file)
--- a/jjb/airship/job_bml_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_integration_tests_centos.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPM3 integration test.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) BML
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: bml_integration_tests_centos
     name: '{job_prefix}_{name}_bml_integration_tests_centos'
-    description: "K8s CAPIM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
+    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_bml_master_integration_tests_centos.yml b/jjb/metal3/job_bml_master_integration_tests_centos.yml
similarity index 91%
rename from jjb/airship/job_bml_master_integration_tests_centos.yml
rename to jjb/metal3/job_bml_master_integration_tests_centos.yml
index 595f820e2ffc440ef637d2eb9378a4609c1d3623..0d713e5811899d8a82fd07fb9b3a2db92922d2e1 100644 (file)
--- a/jjb/airship/job_bml_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_bml_master_integration_tests_centos.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPM3 integration test.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) BML
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: bml_master_integration_tests_centos
     name: '{job_prefix}_master_bml_integration_tests_centos'
-    description: "K8s CAPIM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
+    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
similarity index 92%
rename from jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
index 016d71e49c3ad536641610228fbccd7d42969826..3482394ea85896ff3b315b7ee2df6d7b7238376a 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a4_integration_tests_centos
+    id: capm3_v1a4_integration_tests_centos
     name: '{job_prefix}_{name}_v1a4_integration_test_centos'
-    description: "K8s CAPI metal3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
index 290aef92a87c15c053c634aacad29935e76f8522..50f291a162d03a617f874b59e9cde1e6b47e25d6 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a4_integration_tests_ubuntu
+    id: capm3_v1a4_integration_tests_ubuntu
     name: '{job_prefix}_{name}_v1a4_integration_test_ubuntu'
-    description: "K8s CAPI metal3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a4_master_integration_tests_centos.yml
similarity index 90%
rename from jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a4_master_integration_tests_centos.yml
index dfc635da5df5e1d4ff5b82a92c7b1e8c8d07f47f..99713adb367abc58091ac24d10dfef1a51f2488c 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a4_master_integration_tests_centos.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a4_master_integration_tests_centos
+    id: capm3_v1a4_master_integration_tests_centos
     name: '{job_prefix}_master_v1a4_integration_test_centos'
-    description: "K8s CAPI metal3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a4_master_integration_tests_ubuntu.yml
similarity index 90%
rename from jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a4_master_integration_tests_ubuntu.yml
index 94326b6deb55f291200bdd33edcc3e169abbb1a2..84787099893eb7a3ee98c66b962b3b7ee9e8e7ea 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a4_master_integration_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a4_master_integration_tests_ubuntu
+    id: capm3_v1a4_master_integration_tests_ubuntu
     name: '{job_prefix}_master_v1a4_integration_test_ubuntu'
-    description: "K8s CAPI metal3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1alpha4 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
similarity index 93%
rename from jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
index 80ef21e7b55cd21d422ba6648f2b3b712908cbe9..1e22392e3523a8cac4e57f9a0bab3333a766a279 100644 (file)
--- a/jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal e2e tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_e2e_v1a5_tests_centos
+    id: capm3_v1a5_e2e_tests_centos
     name: '{job_prefix}_{name}_v1a5_e2e_test_centos'
-    description: "K8s CAPI metal3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
similarity index 93%
rename from jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
index a7797b0e0d35097ffad1fbcef05970247aa36d5c..5330d9abc827d6438f9a74a5552a4d21de1bc1c5 100644 (file)
--- a/jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal e2e tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_e2e_v1a5_tests_ubuntu
+    id: capm3_v1a5_e2e_tests_ubuntu
     name: '{job_prefix}_{name}_v1a5_e2e_test_ubuntu'
-    description: "K8s CAPI metal3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
similarity index 92%
rename from jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
index aca035ef1ed7297dbea849bb7e72bf7bc37ca8d7..600154bbfdb2337edcfffdc70884fd599239ed02 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a5_integration_tests_centos
+    id: capm3_v1a5_integration_tests_centos
     name: '{job_prefix}_{name}_v1a5_integration_test_centos'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
index 035111b918a8bc288197f3af9b56a8e3711bd141..96ef243950734036d70a4684e5a56f2a82e9b81a 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a5_integration_tests_ubuntu
+    id: capm3_v1a5_integration_tests_ubuntu
     name: '{job_prefix}_{name}_v1a5_integration_test_ubuntu'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_master_e2e_tests_centos.yml
similarity index 92%
rename from jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_master_e2e_tests_centos.yml
index a1c843c13c7bbb1a123136e8d4e26cf405a0f2a8..605079a7bf9e25079cb534b7caf133d9c390f161 100644 (file)
--- a/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_master_e2e_tests_centos.yml
@@ -20,13 +20,13 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 E2E tests.
+# This file contains job template definition for Cluster API Provider Metal3 (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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_master_e2e_v1a5_tests_centos
-    name: '{job_prefix}_master_e2e_v1a5_test_centos'
+    id: capm3_v1a5_master_e2e_tests_centos
+    name: '{job_prefix}_master_v1a5_e2e_test_centos'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global

diff --git a/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_master_e2e_tests_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_master_e2e_tests_ubuntu.yml
index a8e8f20e0fe74610eacca396864c7f58700ab753..2f6c2bb2090bbd09f851d54592a073e6b525ccf6 100644 (file)
--- a/jjb/airship/job_capi_capm3_master_e2e_v1a5_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_master_e2e_tests_ubuntu.yml
@@ -20,13 +20,13 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 E2E tests.
+# This file contains job template definition for Cluster API Provider Metal3 (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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_master_e2e_v1a5_tests_ubuntu
-    name: '{job_prefix}_master_e2e_v1a5_test_ubuntu'
+    id: capm3_v1a5_master_e2e_tests_ubuntu
+    name: '{job_prefix}_master_v1a5_e2e_test_ubuntu'
     description: "CAPM3 v1alpha5 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global

diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1a5_master_integration_tests_centos.yml
similarity index 90%
rename from jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_master_integration_tests_centos.yml
index 3a0f77307fd027bfdb56f08519f7ec595b352e3b..b7fac187a8382965d741a6ba2308de96105f6089 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1a5_master_integration_tests_centos.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a5_master_integration_tests_centos
+    id: capm3_v1a5_master_integration_tests_centos
     name: '{job_prefix}_master_v1a5_integration_test_centos'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1a5_master_integration_tests_ubuntu.yml
similarity index 90%
rename from jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_master_integration_tests_ubuntu.yml
index 050c22e842abb861d75e7459618a218e59272a65..2f910cc646b5d1e6907044f637e5800d1236675e 100644 (file)
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1a5_master_integration_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_bm_v1a5_master_integration_tests_ubuntu
+    id: capm3_v1a5_master_integration_tests_ubuntu
     name: '{job_prefix}_master_v1a5_integration_test_ubuntu'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
similarity index 92%
rename from jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml
rename to jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
index b917a08ce0103b1646502de13b66e41f53586846..603813f1d4273e31e7b44ba4d0949c60bbe562a0 100644 (file)
--- a/jjb/airship/job_capi_capm3_e2e_v1b1_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal e2e tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_e2e_v1b1_tests_centos
+    id: capm3_v1b1_e2e_tests_centos
     name: '{job_prefix}_{name}_v1b1_e2e_test_centos'
-    description: "K8s CAPI metal3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
index 46feccbc2df26a6dfabd0844286a8f90f888c131..364d0da714402a8c5ba1e8a14385a2c370d58497 100644 (file)
--- a/jjb/airship/job_capi_capm3_e2e_v1b1_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal e2e tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_e2e_v1b1_tests_ubuntu
+    id: capm3_v1b1_e2e_tests_ubuntu
     name: '{job_prefix}_{name}_v1b1_e2e_test_ubuntu'
-    description: "K8s CAPI metal3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_e2e_upgrade_v1b1_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_capi_capm3_e2e_upgrade_v1b1_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
index 0a8046d13ad8df9cfcdf3fdddb4e763b12ab1dcc..f124d51a4d06c6ecb90c474646453067d6c7a25c 100644 (file)
--- a/jjb/airship/job_capi_capm3_e2e_upgrade_v1b1_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_e2e_upgrade_tests_ubuntu.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal e2e tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) e2e tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_e2e_upgrade_v1b1_tests_ubuntu
+    id: capm3_v1b1_e2e_upgrade_tests_ubuntu
     name: '{job_prefix}_{name}_v1b1_e2e_upgrade_test_ubuntu'
-    description: "K8s CAPI metal3 v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1beta1 e2e upgrade tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_capi_capm3_v1b1_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
similarity index 94%
rename from jjb/airship/job_capi_capm3_v1b1_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
index b4c8576123b78406604bcafad9049769719971e5..76b672cf2228b363e1b4bbab8c73f4a50140deec 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1b1_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_integration_tests_centos.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 v1beta1 integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: capm3_v1b1_integration_tests_centos

diff --git a/jjb/airship/job_capi_capm3_v1b1_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
similarity index 94%
rename from jjb/airship/job_capi_capm3_v1b1_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
index 11879366f470ca16bdc91f1c8fae8f70aceda8d3..296ed893c8566979e2bd57a8479d609817e353b7 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1b1_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_integration_tests_ubuntu.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 v1beta1 integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: capm3_v1b1_integration_tests_ubuntu

diff --git a/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_master_e2e_tests_centos.yml
similarity index 92%
rename from jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml
rename to jjb/metal3/job_capm3_v1b1_master_e2e_tests_centos.yml
index 510efb846774c8d974f985e09295d86923f754b0..7591c02c67501b684ccdfbf388c42befe3ede322 100644 (file)
--- a/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_master_e2e_tests_centos.yml
@@ -20,13 +20,13 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 E2E tests.
+# This file contains job template definition for Cluster API Provider Metal3 (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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_master_e2e_v1b1_tests_centos
-    name: '{job_prefix}_master_e2e_v1b1_test_centos'
+    id: capm3_v1b1_master_e2e_tests_centos
+    name: '{job_prefix}_master_v1b1_e2e_test_centos'
     description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global

diff --git a/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_master_e2e_tests_ubuntu.yml
similarity index 93%
rename from jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_master_e2e_tests_ubuntu.yml
index 085d03a69d33b0bc8b0f7de9f499f5dd962d8d2a..ea3b93b5e888914f8f73287ff841d841825c7f59 100644 (file)
--- a/jjb/airship/job_capi_capm3_master_e2e_v1b1_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_master_e2e_tests_ubuntu.yml
@@ -20,12 +20,12 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 E2E tests.
+# This file contains job template definition for Cluster API Provider Metal3 (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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    id: capi_capm3_master_e2e_v1b1_tests_ubuntu
+    id: capm3_v1b1_master_e2e_tests_ubuntu
     name: '{job_prefix}_master_e2e_v1b1_test_ubuntu'
     description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline

diff --git a/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_centos.yml b/jjb/metal3/job_capm3_v1b1_master_integration_tests_centos.yml
similarity index 93%
rename from jjb/airship/job_capi_capm3_v1b1_master_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1b1_master_integration_tests_centos.yml
index 4809ec78193ec4b53a4bf72d5304e0804fd1abf1..d3c0864ccee46bbaed0e7edfa316eeaf8ea10b90 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_centos.yml
+++ b/jjb/metal3/job_capm3_v1b1_master_integration_tests_centos.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 v1beta1 master integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 master 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: capm3_v1b1_master_integration_tests_centos

diff --git a/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_ubuntu.yml b/jjb/metal3/job_capm3_v1b1_master_integration_tests_ubuntu.yml
similarity index 93%
rename from jjb/airship/job_capi_capm3_v1b1_master_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1b1_master_integration_tests_ubuntu.yml
index 4a6a5b8cf6f8b432cdf4ef698fe2db33e7fa02ea..7b8c2f7dc7d2548f29803c3c46d9befcba8ecbe2 100644 (file)
--- a/jjb/airship/job_capi_capm3_v1b1_master_integration_tests_ubuntu.yml
+++ b/jjb/metal3/job_capm3_v1b1_master_integration_tests_ubuntu.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 v1beta1 master integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) v1beta1 master 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: capm3_v1b1_master_integration_tests_ubuntu

diff --git a/jjb/airship/job_docker_image_building.yml b/jjb/metal3/job_docker_image_building.yml
similarity index 92%
rename from jjb/airship/job_docker_image_building.yml
rename to jjb/metal3/job_docker_image_building.yml
index 903787fb7b4da1c5cba32d55e35a4f254b5a4e6f..12f85e6f7d1dcc0405bcded5a29ffc136b3f9604 100644 (file)
--- a/jjb/airship/job_docker_image_building.yml
+++ b/jjb/metal3/job_docker_image_building.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Docker image building.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: docker_image_building

diff --git a/jjb/airship/job_feature_tests_centos.yml b/jjb/metal3/job_feature_tests_centos.yml
similarity index 97%
rename from jjb/airship/job_feature_tests_centos.yml
rename to jjb/metal3/job_feature_tests_centos.yml
index fbec76196d19ab01390e0e91587d571dc316feaf..f18616a2dd19e90f683fe1413c2be662ad9b9f82 100644 (file)
--- a/jjb/airship/job_feature_tests_centos.yml
+++ b/jjb/metal3/job_feature_tests_centos.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for K8s CAPI Baremetal feature tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: feature_tests_centos

diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/metal3/job_feature_tests_ubuntu.yml
similarity index 95%
rename from jjb/airship/job_feature_tests_ubuntu.yml
rename to jjb/metal3/job_feature_tests_ubuntu.yml
index da78bf26cca223f9f948cb419dafe34d91405660..13dd599c9d4a04aaf5e48533cbd6832b6701d505 100644 (file)
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_feature_tests_ubuntu.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) feature tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: feature_tests_ubuntu

diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
similarity index 95%
rename from jjb/airship/job_feature_tests_upgrade_ubuntu.yml
rename to jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
index b1fe648e62960770fcb124cbb0fb8adcd60bad3a..79f01a30b3c1a15823986e2449cce2b020eed32a 100644 (file)
--- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_feature_tests_upgrade_ubuntu.yml
@@ -20,9 +20,10 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3) feature
+# upgrade tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: feature_tests_upgrade_ubuntu

diff --git a/jjb/airship/job_ipa_image_building.yml b/jjb/metal3/job_ipa_image_building.yml
similarity index 98%
rename from jjb/airship/job_ipa_image_building.yml
rename to jjb/metal3/job_ipa_image_building.yml
index 85c8cb2b715756f6042c3fb565a08caaac28ca5d..808227f3aacd5330338993bd2a0cd6bc64fa84ab 100644 (file)
--- a/jjb/airship/job_ipa_image_building.yml
+++ b/jjb/metal3/job_ipa_image_building.yml
@@ -22,7 +22,7 @@
 # ============
 # This file contains job template definition for nordix IPA image building.
 # This job can be triggered manually. It creates a pipeline job.
-# The pipeline scripts are maintained in Nordix/airship-dev-tools repository.
+# The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: openstack_ipa_and_ironic_image_building

diff --git a/jjb/airship/job_ipa_image_building_test.yml b/jjb/metal3/job_ipa_image_building_test.yml
similarity index 98%
rename from jjb/airship/job_ipa_image_building_test.yml
rename to jjb/metal3/job_ipa_image_building_test.yml
index 2c0efd928b13f5609e80ee7e59c2a119a9a22bd9..cf22253f475bd11c2a7bc9e32a71932c7b3a1d6e 100644 (file)
--- a/jjb/airship/job_ipa_image_building_test.yml
+++ b/jjb/metal3/job_ipa_image_building_test.yml
@@ -22,7 +22,7 @@
 # ============
 # This file contains job template definition for for nordix IPA image building test.
 # This job can be triggered on PRs manually. It creates a pipeline job.
-# The pipeline scripts are maintained in Nordix/airship-dev-tools repository.
+# The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: metal3_ipa_and_ironic_image_building_test

diff --git a/jjb/airship/job_keep_integration_vm_v1a5_centos.yml b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
similarity index 92%
rename from jjb/airship/job_keep_integration_vm_v1a5_centos.yml
rename to jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
index 26ba8c3773817751b8b53660590242bf4bac1011..8e48a4535faa857fbe8423a743539bf1d9badd16 100644 (file)
--- a/jjb/airship/job_keep_integration_vm_v1a5_centos.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# keeping integration test vm.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: keep_v1a5_test_centos_alive
     name: '{job_prefix}_{name}_keep_v1a5_test_centos_alive'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_keep_integration_vm_v1a5_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_keep_integration_vm_v1a5_ubuntu.yml
rename to jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
index fd1f39b033fd4e9050e4767389ec4d4ab310ccad..fa02bd32adbf6da8b266dc17ebbb204ebc0cb58f 100644 (file)
--- a/jjb/airship/job_keep_integration_vm_v1a5_ubuntu.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1a5_ubuntu.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# keeping integration test vm.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: keep_v1a5_test_ubuntu_alive
     name: '{job_prefix}_{name}_keep_v1a5_test_ubuntu_alive'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_keep_integration_vm_v1b1_centos.yml b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
similarity index 92%
rename from jjb/airship/job_keep_integration_vm_v1b1_centos.yml
rename to jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
index 2d6e8a51fd8af847f05c84b6e6879066e81dddce..4e775496e4603f62d0aac730b6f3c1e65ebddacf 100644 (file)
--- a/jjb/airship/job_keep_integration_vm_v1b1_centos.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1b1_centos.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 v1beta1 integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# keeping integration test vm.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: keep_v1b1_test_centos_alive
     name: '{job_prefix}_{name}_keep_v1b1_test_centos_alive'
-    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS."
+    description: "CAPM3 v1beta1 integration tests for keeping the vm for {repo[org]}/{repo[name]} on CentOS."
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_keep_integration_vm_v1b1_ubuntu.yml b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
similarity index 92%
rename from jjb/airship/job_keep_integration_vm_v1b1_ubuntu.yml
rename to jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
index 03d2693fb41636e654864ac46e405121f8e06f8b..9bf928c8959dc219b2b7a515a62c9dcab28f25b2 100644 (file)
--- a/jjb/airship/job_keep_integration_vm_v1b1_ubuntu.yml
+++ b/jjb/metal3/job_keep_integration_vm_v1b1_ubuntu.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for CAPM3 v1beta1 integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# keeping integration test vm.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: keep_v1b1_test_ubuntu_alive
     name: '{job_prefix}_{name}_keep_v1b1_test_ubuntu_alive'
-    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on Ubuntu."
+    description: "CAPM3 v1beta1 integration tests for keeping the vm for {repo[org]}/{repo[name]} on Ubuntu."
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_linter_tests.yml b/jjb/metal3/job_linter_tests.yml
similarity index 94%
rename from jjb/airship/job_linter_tests.yml
rename to jjb/metal3/job_linter_tests.yml
index 339003122fb74df1272e1afc62c0d3278185bd5c..3d48d585f1c6a228edf1e25a731176822aed7222 100644 (file)
--- a/jjb/airship/job_linter_tests.yml
+++ b/jjb/metal3/job_linter_tests.yml
@@ -20,9 +20,9 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for linter tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: linter_tests

diff --git a/jjb/airship/job_master_clean.yml b/jjb/metal3/job_master_clean.yml
similarity index 91%
rename from jjb/airship/job_master_clean.yml
rename to jjb/metal3/job_master_clean.yml
index 43cd780c10675e00c024726ddd99ab73812bf9e2..a8cac1ce9c6b076de3c01d0e920ef8ba5cb69c9b 100644 (file)
--- a/jjb/airship/job_master_clean.yml
+++ b/jjb/metal3/job_master_clean.yml
@@ -20,10 +20,10 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPM3 integration tests
+# This file contains job template definition for K8s Cluster API Provider Metal3 (CAPM3) integration tests
 # cleanup.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: master_clean

diff --git a/jjb/airship/job_master_feature_tests_centos.yml b/jjb/metal3/job_master_feature_tests_centos.yml
similarity index 94%
rename from jjb/airship/job_master_feature_tests_centos.yml
rename to jjb/metal3/job_master_feature_tests_centos.yml
index 264d6deff0a08e73d574dca04b276f1510fa1f90..598a86d85a0989ad31874dd131bda7513f9af06a 100644 (file)
--- a/jjb/airship/job_master_feature_tests_centos.yml
+++ b/jjb/metal3/job_master_feature_tests_centos.yml
@@ -20,9 +20,10 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# feature tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: master_feature_tests_centos

diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/metal3/job_master_feature_tests_ubuntu.yml
similarity index 94%
rename from jjb/airship/job_master_feature_tests_ubuntu.yml
rename to jjb/metal3/job_master_feature_tests_ubuntu.yml
index 8d3a5fd3f487cc8cd591f2abf1ee688ba874d9b0..9a8fcbf8dcfec2ab4083f66643ee6d1714a868e5 100644 (file)
--- a/jjb/airship/job_master_feature_tests_ubuntu.yml
+++ b/jjb/metal3/job_master_feature_tests_ubuntu.yml
@@ -20,9 +20,10 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# feature tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: master_feature_tests_ubuntu

diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/metal3/job_master_feature_tests_upgrade_ubuntu.yml
similarity index 94%
rename from jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
rename to jjb/metal3/job_master_feature_tests_upgrade_ubuntu.yml
index a829627bf7d7b259007c86215ee182d99c8ce5bd..d4cc7a8691e90d134adbfb5c583a9b5f4df29787 100644 (file)
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/metal3/job_master_feature_tests_upgrade_ubuntu.yml
@@ -20,9 +20,10 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Cluster API Provider Metal3 (CAPM3)
+# feature upgrade tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
     id: master_feature_tests_upgrade_ubuntu

diff --git a/jjb/airship/job_airship_integration_test_centos.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
similarity index 86%
rename from jjb/airship/job_airship_integration_test_centos.yml
rename to jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
index a11f99dfe0fe41778dd664d0d8b8f2f627d5d5d0..746ad6ed6416ba084ce83b07a11cba3827087760 100644 (file)
--- a/jjb/airship/job_airship_integration_test_centos.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPM3 integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
-    id: airship_integration_test_centos
-    name: 'airship_dev_tools_integration_test_centos'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS. "
+    id: metal3_dev_tools_integration_test_centos
+    name: 'metal3_dev_tools_integration_test_centos'
+    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on CentOS. "
     project-type: pipeline
     defaults: global
     disabled: False
@@ -94,7 +95,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-airship-centos(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-centos(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -104,7 +105,7 @@
         white-list-target-branches:
           - 'master'
           - 'main'
-        status-context: "test-integration-airship-centos"
+        status-context: "test-integration-metal3-centos"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
@@ -121,5 +122,5 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: 'ci/jobs/airship_integration_tests.pipeline'
+      script-path: 'ci/jobs/metal3_dev_tools_integration_tests.pipeline'
       lightweight-checkout: False

diff --git a/jjb/airship/job_airship_integration_test_ubuntu.yml b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
similarity index 86%
rename from jjb/airship/job_airship_integration_test_ubuntu.yml
rename to jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
index 48791592135aa3a6aa7d032e1e2deeffe34b4aeb..ed244edc997a20f71c0f9c03ba72e5252adfb2f2 100644 (file)
--- a/jjb/airship/job_airship_integration_test_ubuntu.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
@@ -20,14 +20,15 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPM3 integration tests.
+# 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 Airship CI repository.
+# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
-    id: airship_integration_test_ubuntu
-    name: 'airship_dev_tools_integration_test_ubuntu'
-    description: "K8s CAPI metal3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
+    id: metal3_dev_tools_integration_test_ubuntu
+    name: 'metal3_dev_tools_integration_test_ubuntu'
+    description: "CAPM3 v1beta1 integration tests for {repo[org]}/{repo[name]} on Ubuntu. "
     project-type: pipeline
     defaults: global
     disabled: False
@@ -94,7 +95,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-integration-airship-ubuntu(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-integration-metal3-ubuntu(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -103,7 +104,7 @@
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches:
           - 'master'
-        status-context: "test-integration-airship-ubuntu"
+        status-context: "test-integration-metal3-ubuntu"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"
@@ -120,5 +121,5 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
-      script-path: 'ci/jobs/airship_integration_tests.pipeline'
+      script-path: 'ci/jobs/metal3_dev_tools_integration_tests.pipeline'
       lightweight-checkout: False

diff --git a/jjb/airship/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml
similarity index 89%
rename from jjb/airship/job_openstack_image_building.yml
rename to jjb/metal3/job_openstack_image_building.yml
index 68bfa31660094d907537d7d93b1299168451dcb1..add69a9b56f2d856257e305a9fa48fd7ea20f241 100644 (file)
--- a/jjb/airship/job_openstack_image_building.yml
+++ b/jjb/metal3/job_openstack_image_building.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for Openstack image building tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: openstack_image_building
     name: '{job_prefix}_openstack_image_building'
-    description: "Builder job for Openstack images for Airship CI"
+    description: "Builder job for Openstack images for Metal3 CI"
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_openstack_node_image_building.yml b/jjb/metal3/job_openstack_node_image_building.yml
similarity index 89%
rename from jjb/airship/job_openstack_node_image_building.yml
rename to jjb/metal3/job_openstack_node_image_building.yml
index 6bd6bdf89ef551c2c5a0bd9a333c0f6ea97cbff2..6c3cc5c495eec43723fff2b91e8b53eda8249542 100644 (file)
--- a/jjb/airship/job_openstack_node_image_building.yml
+++ b/jjb/metal3/job_openstack_node_image_building.yml
@@ -20,14 +20,14 @@
 
 # Description:
 # ============
-# This file contains job template definition for K8s CAPI Baremetal integration tests.
+# This file contains job template definition for node image building tests tests.
 # 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.
+# pipeline job. The pipeline scripts are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: openstack_node_image_building
     name: '{job_prefix}_openstack_node_image_building'
-    description: "Builder job for Openstack node images for Airship CI"
+    description: "Builder job for Openstack node images for Metal3 CI"
     project-type: pipeline
     defaults: global
     disabled: False

diff --git a/jjb/airship/job_update_nordix_artifacts.yml b/jjb/metal3/job_update_nordix_artifacts.yml
similarity index 97%
rename from jjb/airship/job_update_nordix_artifacts.yml
rename to jjb/metal3/job_update_nordix_artifacts.yml
index f990f66b638312ff6b6f9e0c1e92115b5baa73ec..c24359e343a73be56f53e713a57f18b40070c0de 100644 (file)
--- a/jjb/airship/job_update_nordix_artifacts.yml
+++ b/jjb/metal3/job_update_nordix_artifacts.yml
@@ -23,7 +23,7 @@
 # This file contains job template definition for updating Nordix Artifactory
 # from upstream artifacts. This job can be triggered manually but is intended
 # to run on a schedule request. It creates a pipeline job. The pipeline scripts
-# are maintained in Airship CI repository.
+# are maintained in Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: update_nordix_artifacts

diff --git a/jjb/airship/job_update_nordix_repos.yml b/jjb/metal3/job_update_nordix_repos.yml
similarity index 98%
rename from jjb/airship/job_update_nordix_repos.yml
rename to jjb/metal3/job_update_nordix_repos.yml
index 63757b9f169ab9c9aac7e56c7877fa745bca74b1..e3ad1f8434acae707038e96e448f06070c49ef5d 100644 (file)
--- a/jjb/airship/job_update_nordix_repos.yml
+++ b/jjb/metal3/job_update_nordix_repos.yml
@@ -23,7 +23,7 @@
 # This file contains job template definition for updating Nordix repositories
 # from upstream. 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.
+# Nordix/metal3-dev-tools repository.
 
 - job-template:
     id: update_nordix_repos

diff --git a/jjb/airship/projects.yml b/jjb/metal3/projects.yml
similarity index 70%
rename from jjb/airship/projects.yml
rename to jjb/metal3/projects.yml
index 08ae3652adc22e5d6a5b806799cd3bb8b53a556e..b02493465cc547a34da29c1662c32aca455f378b 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -21,7 +21,7 @@
 
 # Description:
 # ============
-# This file contains the list of JJB projects in airship category. Each project
+# This file contains the list of JJB projects in metal3 category. Each project
 # corresponds to a github repository. Under each project's 'jobs' list defines the
 # jobs associated with that github repository. The job definitions can be found
 # in job_{job_id}.yml files in any of JJB include folders.
@@ -30,7 +30,7 @@
     name: 'nordix_dev_tools'
     branch: '${{ghprbActualCommit}}'
     ci_github_whitelist_org:
-    - nordix-airship
+    - nordix-metal3
     jobs:
     - linter_tests
     - openstack_image_building
@@ -40,15 +40,15 @@
     - openstack_node_image_building
     - openstack_ipa_and_ironic_image_building
     - metal3_ipa_and_ironic_image_building_test
-    - airship_integration_test_centos
-    - airship_integration_test_ubuntu
+    - metal3_dev_tools_integration_test_centos
+    - metal3_dev_tools_integration_test_ubuntu
     - artifactory_cleanup
     repo:
       org: "Nordix"
-      name: "airship-dev-tools"
+      name: "metal3-dev-tools"
     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'
+    ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
 - project:
     name: 'metal3io_project_infra'
@@ -58,10 +58,10 @@
       name: "project-infra"
     ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
     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
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - feature_tests_ubuntu
@@ -88,10 +88,10 @@
       org: "metal3-io"
       name: "baremetal-operator"
     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
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
@@ -106,10 +106,10 @@
       org: "metal3-io"
       name: "ip-address-manager"
     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
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
@@ -120,14 +120,14 @@
 - project:
     name: "metal3io_metal3_dev_env"
     jobs:
-    - capi_bm_v1a4_integration_tests_centos
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a4_master_integration_tests_centos
-    - capi_bm_v1a4_master_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_centos
-    - capi_bm_v1a5_integration_tests_ubuntu
-    - capi_bm_v1a5_master_integration_tests_centos
-    - capi_bm_v1a5_master_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a4_master_integration_tests_centos
+    - capm3_v1a4_master_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
+    - capm3_v1a5_master_integration_tests_centos
+    - capm3_v1a5_master_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - capm3_v1b1_master_integration_tests_centos
@@ -155,21 +155,21 @@
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
     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
-    - capi_capm3_e2e_v1a5_tests_ubuntu
-    - capi_capm3_e2e_v1a5_tests_centos
-    - capi_capm3_master_e2e_v1a5_tests_ubuntu
-    - capi_capm3_master_e2e_v1a5_tests_centos
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
+    - capm3_v1a5_e2e_tests_ubuntu
+    - capm3_v1a5_e2e_tests_centos
+    - capm3_v1a5_master_e2e_tests_ubuntu
+    - capm3_v1a5_master_e2e_tests_centos
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
-    - capi_capm3_e2e_v1b1_tests_centos
-    - capi_capm3_e2e_v1b1_tests_ubuntu
-    - capi_capm3_e2e_upgrade_v1b1_tests_ubuntu
-    - capi_capm3_master_e2e_v1b1_tests_centos
-    - capi_capm3_master_e2e_v1b1_tests_ubuntu
+    - capm3_v1b1_e2e_tests_centos
+    - capm3_v1b1_e2e_tests_ubuntu
+    - capm3_v1b1_e2e_upgrade_tests_ubuntu
+    - capm3_v1b1_master_e2e_tests_centos
+    - capm3_v1b1_master_e2e_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -182,10 +182,10 @@
       org: "metal3-io"
       name: "ironic-image"
     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
+    - capm3_v1a4_integration_tests_centos
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_centos
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
@@ -199,7 +199,7 @@
       org: "metal3-io"
       name: "ironic-ipa-downloader"
     jobs:
-    - capi_bm_v1a4_integration_tests_ubuntu
-    - capi_bm_v1a5_integration_tests_ubuntu
+    - capm3_v1a4_integration_tests_ubuntu
+    - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu