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
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 91%
rename from jjb/airship/defaults.yml
rename to jjb/metal3/defaults.yml
index e6b604e..884d641 100644
--- 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 95%
rename from jjb/airship/job_artifactory_cleanup.yml
rename to jjb/metal3/job_artifactory_cleanup.yml
index f9d1fa8..deff01d 100644
--- 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 2304a21..252ea72 100644
--- 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 90%
rename from jjb/airship/job_bml_master_integration_tests_centos.yml
rename to jjb/metal3/job_bml_master_integration_tests_centos.yml
index 595f820..0d713e5 100644
--- 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 91%
rename from jjb/airship/job_capi_bm_v1a4_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a4_integration_tests_centos.yml
index 016d71e..3482394 100644
--- 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 91%
rename from jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a4_integration_tests_ubuntu.yml
index 290aef9..50f291a 100644
--- 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 89%
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 dfc635d..99713ad 100644
--- 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 89%
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 94326b6..8478709 100644
--- 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 92%
rename from jjb/airship/job_capi_capm3_e2e_v1a5_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_e2e_tests_centos.yml
index 80ef21e..1e22392 100644
--- 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 92%
rename from jjb/airship/job_capi_capm3_e2e_v1a5_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_e2e_tests_ubuntu.yml
index a7797b0..5330d9a 100644
--- 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 91%
rename from jjb/airship/job_capi_bm_v1a5_integration_tests_centos.yml
rename to jjb/metal3/job_capm3_v1a5_integration_tests_centos.yml
index aca035e..600154b 100644
--- 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 91%
rename from jjb/airship/job_capi_bm_v1a5_integration_tests_ubuntu.yml
rename to jjb/metal3/job_capm3_v1a5_integration_tests_ubuntu.yml
index 035111b..96ef243 100644
--- 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 91%
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 a1c843c..605079a 100644
--- 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 91%
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 a8e8f20..2f6c2bb 100644
--- 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 89%
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 3a0f773..b7fac18 100644
--- 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 89%
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 050c22e..2f910cc 100644
--- 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 b917a08..603813f 100644
--- 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 46feccb..364d0da 100644
--- 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 0a8046d..f124d51 100644
--- 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 b4c8576..76b672c 100644
--- 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 1187936..296ed89 100644
--- 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 91%
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 510efb8..7591c02 100644
--- 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 085d03a..ea3b93b 100644
--- 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 4809ec7..d3c0864 100644
--- 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 4a6a5b8..7b8c2f7 100644
--- 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 903787f..12f85e6 100644
--- 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 fbec761..f18616a 100644
--- 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 da78bf2..13dd599 100644
--- 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 b1fe648..79f01a3 100644
--- 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 97%
rename from jjb/airship/job_ipa_image_building.yml
rename to jjb/metal3/job_ipa_image_building.yml
index 85c8cb2..808227f 100644
--- 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 2c0efd9..cf22253 100644
--- 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 26ba8c3..8e48a45 100644
--- 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 fd1f39b..fa02bd3 100644
--- 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 2d6e8a5..4e77549 100644
--- 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 03d2693..9bf928c 100644
--- 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 3390031..3d48d58 100644
--- 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 92%
rename from jjb/airship/job_master_clean.yml
rename to jjb/metal3/job_master_clean.yml
index 43cd780..a8cac1c 100644
--- 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 264d6de..598a86d 100644
--- 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 8d3a5fd..9a8fcbf 100644
--- 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 a829627..d4cc7a8 100644
--- 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 85%
rename from jjb/airship/job_airship_integration_test_centos.yml
rename to jjb/metal3/job_metal3_dev_tools_integration_test_centos.yml
index a11f99d..746ad6e 100644
--- 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 85%
rename from jjb/airship/job_airship_integration_test_ubuntu.yml
rename to jjb/metal3/job_metal3_dev_tools_integration_test_ubuntu.yml
index 4879159..ed244ed 100644
--- 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 68bfa31..add69a9 100644
--- 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 6bd6bdf..6c3cc5c 100644
--- 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 96%
rename from jjb/airship/job_update_nordix_artifacts.yml
rename to jjb/metal3/job_update_nordix_artifacts.yml
index f990f66..c24359e 100644
--- 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 97%
rename from jjb/airship/job_update_nordix_repos.yml
rename to jjb/metal3/job_update_nordix_repos.yml
index 63757b9..e3ad1f8 100644
--- 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 08ae365..b024934 100644
--- 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