From: Feruzjon Muyassarov <feruzjon.muyassarov@est.tech>
Date: Fri, 29 Oct 2021 11:10:12 +0000 (+0000)
Subject: Merge "Add Airship v1beta1 jobs"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=a11e30729ef68367af80eec3f47534cb70be2800;hp=e9b34b6c525654e90748a45ec8118c58272ca12a;p=infra%2Fcicd.git

Merge "Add Airship v1beta1 jobs"
---

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 5d3204a3..c4772fde 100644
--- 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 fc7bd32c..b7b84ee5 100644
--- 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}_master_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
     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/job_capi_bm_v1a4_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
index 619ad065..424f1e67 100644
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_centos.yml
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "0 4 * * *"
 
     pipeline-scm:
       scm:
diff --git a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
index f6cf7f93..8fb68ae6 100644
--- a/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a4_master_integration_tests_ubuntu.yml
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "15 4 * * *"
 
     pipeline-scm:
       scm:
diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
index bf404b01..7cc3fc0b 100644
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_centos.yml
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "30 4 * * *"
 
     pipeline-scm:
       scm:
diff --git a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
index 72555509..3c6efafb 100644
--- a/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_bm_v1a5_master_integration_tests_ubuntu.yml
@@ -82,7 +82,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 4 * * *"
+      - timed: "45 4 * * *"
 
     pipeline-scm:
       scm:
diff --git a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
index 64be3f64..d99a9054 100644
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_centos.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capi_capm3_v1a5_master_e2e_tests_centos
-    name: '{job_prefix}_{name}_master_e2e_test_centos'
+    name: '{job_prefix}_master_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_v1a5_master_e2e_tests_ubuntu.yml b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
index 12c4673c..6f8ce00c 100644
--- a/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
+++ b/jjb/airship/job_capi_capm3_v1a5_master_e2e_tests_ubuntu.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capi_capm3_v1a5_master_e2e_tests_ubuntu
-    name: '{job_prefix}_{name}_master_e2e_test_ubuntu'
+    name: '{job_prefix}_master_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_feature_tests_centos.yml b/jjb/airship/job_feature_tests_centos.yml
index e880a630..dc59e7bf 100644
--- a/jjb/airship/job_feature_tests_centos.yml
+++ b/jjb/airship/job_feature_tests_centos.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_centos"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_feature_tests_ubuntu.yml b/jjb/airship/job_feature_tests_ubuntu.yml
index 980dd6ff..da8b7376 100644
--- a/jjb/airship/job_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
index d623ac20..2f26569f 100644
--- a/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_feature_tests_upgrade_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_master_feature_tests_centos.yml b/jjb/airship/job_master_feature_tests_centos.yml
index a5d91846..b55eaad8 100644
--- a/jjb/airship/job_master_feature_tests_centos.yml
+++ b/jjb/airship/job_master_feature_tests_centos.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_centos"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_master_feature_tests_ubuntu.yml b/jjb/airship/job_master_feature_tests_ubuntu.yml
index c2dbbf4c..c9ef2df4 100644
--- a/jjb/airship/job_master_feature_tests_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests"
         description: 'Tests for pivoting and remediation.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 24837df5..729cab06 100644
--- a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@ -81,6 +81,10 @@
         name: TESTS_FOR
         default: "feature_tests_upgrade"
         description: 'Tests for upgrade.'
+    - string:
+        name: PROMETHEUS_MONITORING
+        default: "true"
+        description: 'Enable Prometheus metrics'
 
     properties:
     - build-discarder:
diff --git a/jjb/airship/projects.yml b/jjb/airship/projects.yml
index 4d3e04c9..f63765f3 100644
--- a/jjb/airship/projects.yml
+++ b/jjb/airship/projects.yml
@@ -69,8 +69,7 @@
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - bml_integration_test_centos
-    - bml_integration_test_ubuntu
+    - bml_integration_tests_centos
 
 - project:
     name: 'metal3io_project_infra_cleanup'
@@ -131,8 +130,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"
diff --git a/jjb/cloud-infra/scripts/test-package.sh b/jjb/cloud-infra/scripts/test-package.sh
index 8685c337..d9b9b532 100644
--- a/jjb/cloud-infra/scripts/test-package.sh
+++ b/jjb/cloud-infra/scripts/test-package.sh
@@ -21,19 +21,22 @@
 set -o errexit
 set -o pipefail
 
-# NOTE (fdegir): we need to remove $WORKSPACE and clone infra/engine repository
-# as infra/engine is what drives the deployment
+# NOTE (akash): ONAP_TEST_BRANCH is set to master as
+# no other branch is available
+export ONAP_TEST_BRANCH="master"
+
+# NOTE (akash): we need to remove $WORKSPACE and clone infra/test repository
+# as infra/test is what drives the deployment
 if [[ "$GERRIT_PROJECT" != "infra/test" ]]; then
   cd "$HOME" && /bin/rm -rf "$WORKSPACE"
   echo "Info : Cloning infra/engine repository"
   git clone -q https://gerrit.nordix.org/infra/test.git "$WORKSPACE"
   cd "$WORKSPACE"
-  export STACK_VERSION="$GERRIT_BRANCH"
 fi
 
 echo "Info  : Packaging test stack $STACK_TYPE"
 
 cd "$WORKSPACE/test"
-./package.sh -s "$STACK_TYPE" -b "$STACK_VERSION" -d "$DISTRO" -v
+./package.sh -s "$STACK_TYPE" -b "$ONAP_TEST_BRANCH" -d "$DISTRO" -v
 
 # vim: set ts=2 sw=2 expandtab: