add job bml master integration test centos

This commit adds master bml integration tests centos jobs for
metal3-dev-env and project-infra repos,fixes typos,
removes  bml integration tests ubuntu

Change-Id: If2ef36097169144ff24c070ac0bcdc2fa1658e59

diff --git a/jjb/airship/job_bml_integration_test_centos.yml b/jjb/airship/job_bml_integration_tests_centos.yml
similarity index 97%
rename from jjb/airship/job_bml_integration_test_centos.yml
rename to jjb/airship/job_bml_integration_tests_centos.yml
index 5d3204a3735b3558e6c85be1aa2dbe3dde01d677..c4772fde1b01c36301339f8d192f48f4874924c6 100644 (file)
--- a/jjb/airship/job_bml_integration_test_centos.yml
+++ b/jjb/airship/job_bml_integration_tests_centos.yml
@@ -25,8 +25,8 @@
 # pipeline job. The pipeline scripts are maintained in Airship CI repository.
 
 - job-template:
-    id: bml_integration_test_centos
-    name: '{job_prefix}_{name}_bml_integration_test_centos'
+    id: bml_integration_tests_centos
+    name: '{job_prefix}_{name}_bml_integration_tests_centos'
     description: "K8s CAPIM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
     project-type: pipeline
     defaults: global

diff --git a/jjb/airship/job_bml_integration_test_ubuntu.yml b/jjb/airship/job_bml_master_integration_tests_centos.yml
similarity index 76%
rename from jjb/airship/job_bml_integration_test_ubuntu.yml
rename to jjb/airship/job_bml_master_integration_tests_centos.yml
index fc7bd32c101a42c9c19af03a777d3655570d50d8..eb967e38093c402a4fa05af379ecca849a073400 100644 (file)
--- a/jjb/airship/job_bml_integration_test_ubuntu.yml
+++ b/jjb/airship/job_bml_master_integration_tests_centos.yml
@@ -25,9 +25,9 @@
 # pipeline job. The pipeline scripts are maintained in Airship CI repository.
 
 - job-template:
-    id: bml_integration_test_ubuntu
-    name: '{job_prefix}_{name}_bml_integration_test_ubuntu'
-    description: "K8s CAPIM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on Ubuntu in Bare Metal Lab."
+    id: bml_master_integration_tests_centos
+    name: '{job_prefix}_{name}_bml_master_integration_tests_centos'
+    description: "K8s CAPIM3 v1alpha5 integration tests for {repo[org]}/{repo[name]} on CentOS in Bare Metal Lab."
     project-type: pipeline
     defaults: global
     disabled: False
@@ -55,7 +55,7 @@
         description: 'Target branch of the PR'
     - string:
         name: DISTRIBUTION
-        default: 'ubuntu'
+        default: 'centos'
         description: 'Distribution to use for the tests. Can be ubuntu or centos'
     - string:
         name: CAPI_VERSION
@@ -67,7 +67,7 @@
         description: 'Cluster API provider Metal3 version.'
     - string:
         name: TARGET_NODE_OS
-        default: 'Ubuntu'
+        default: 'Centos'
         description: 'Distribution to use for the target host.'
     - string:
         name: TARGET_NODE_MEMORY
@@ -80,31 +80,10 @@
         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: '((.|\n)*\s)?/test-integration-bml-ubuntu(\s(.|\n)*)?'
-        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: "test-integration-bml-ubuntu"
-        success-status: "Passed"
-        failure-status: "Failed"
-        error-status: "Error"
-        cancel-builds-on-update: True
+    - timed: "H 2 * * *"
+    
     pipeline-scm:
       scm:
       - git:

diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index eea8de2a58b73cb3fa0a20b3dc7142731ab42d53..c07e0765501b44fcb2ae30679ffe98ae50feb693 100644 (file)
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -67,8 +67,8 @@
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - bml_integration_test_centos
-    - bml_integration_test_ubuntu
+    - bml_integration_tests_centos
+    - bml_master_integration_tests_centos
 
 - project:
     name: 'metal3io_project_infra_cleanup'
@@ -121,8 +121,8 @@
     - master_feature_tests_ubuntu
     - master_feature_tests_centos
     - master_feature_tests_upgrade_ubuntu
-    - bml_integration_test_centos
-    - bml_integration_test_ubuntu
+    - bml_integration_tests_centos
+    - bml_master_integration_tests_centos
 
     repo:
       org: "metal3-io"