fix: base deployable architecture catalog onboarding (#158)

Author: nupurg-ibm

.catalog-onboard-pipeline.yaml

@@ -13,7 +13,7 @@ offerings:
       install_type: fullstack # ensure value matches what is in ibm_catalog.json (fullstack or extension)
       destroy_resources_on_failure: false # defaults to false if not specified so resources can be inspected to debug failures during validation
       destroy_workspace_on_failure: false # defaults to false if not specified so schematics workspace can be inspected to debug failures during validation
-      import_only: false  # defaults to false - set to true if you do not want to do any validation, but be aware offering can't be publish if not validated
+      import_only: true  # defaults to false - set to true if you do not want to do any validation, but be aware offering can't be publish if not validated
       validation_rg: validation # the resource group in which to do validation in. Will be created if does not exist. If not specified, default value is 'validation'
       # scc details needed if your offering is claiming any compliance controls
       scc:

.tekton/README.md

@@ -27,14 +27,14 @@ https://cloud.ibm.com/devops/getting-started?env_id=ibm:yp:eu-de
 ## Actions on the OnePipeline
 
 1. When PR raised to the develop branch from feature branch, pipeline with trigger and it will run PR_TEST related testcases on top of feature branch
-2. When Commit/Push happens to develop branch, pipeline will trigger and it will run all PR_TEST and OTHER_TEST testcases
+2. When Commit/Push happens to develop branch, pipeline will trigger and it will run all the PR_TEST and OTHER_TEST testcases
 
 ### Setup required parameters to run pipeline
 
 1. ibmcloud-api
 2. ssh_keys
 3. cluster_prefix
-4. zones
+4. zone
 5. resource_group
 6. cluster_id
 7. reservation_id

.tekton/git-pr-status/listener-git-pr-status.yaml

@@ -31,9 +31,9 @@ spec:
     - name: ssh_keys
       default: ""
       description: List of names of the SSH keys that is configured in your IBM Cloud account, used to establish a connection to the IBM Cloud HPC bastion and login node. Ensure that the SSH key is present in the same resource group and region where the cluster is being provisioned. If you do not have an SSH key in your IBM Cloud account, create one by according to [SSH Keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys).
-    - name: zones
+    - name: zone
       default: ""
-      description: IBM Cloud zone names within the selected region where the IBM Cloud HPC cluster should be deployed. Two zone names are required as input value and supported zones for eu-de are eu-de-2, eu-de-3 and for us-east us-east-1, us-east-3. The management nodes and file storage shares will be deployed to the first zone in the list. Compute nodes will be deployed across both first and second zones, where the first zone in the list will be considered as the most preferred zone for compute nodes deployment. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
+      description: The IBM Cloud zone name within the selected region where the IBM Cloud HPC cluster should be deployed and requires a single zone input value. Supported zones are eu-de-2 and eu-de-3 for eu-de, us-east-1 and us-east-3 for us-east, and us-south-1 for us-south. The management nodes, file storage shares, and compute nodes will be deployed in the same zone.[Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
     - name: cluster_prefix
       description: Prefix that is used to name the IBM Cloud HPC cluster and IBM Cloud resources that are provisioned to build the IBM Cloud HPC cluster instance. You cannot create more than one instance of the IBM Cloud HPC cluster with the same name. Ensure that the name is unique.
       default: cicd-wes
@@ -58,12 +58,30 @@ spec:
     - name: reservation_id
       description: Ensure that you have received the reservation ID from IBM technical sales. Reservation ID is a unique identifier to distinguish different IBM Cloud HPC service agreements. It must start with a letter and can only contain letters, numbers, hyphens (-), or underscores (_).
       default: ""
+    - name: us_east_zone
+      default: ""
+      description: The IBM Cloud zone name within the selected region where the IBM Cloud HPC cluster should be deployed and requires a single zone input value. Supported zones are eu-de-2 and eu-de-3 for eu-de, us-east-1 and us-east-3 for us-east, and us-south-1 for us-south. The management nodes, file storage shares, and compute nodes will be deployed in the same zone.[Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
+    - name: us_east_cluster_id
+      description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
+      default: ""
     - name: us_east_reservation_id
       description: Ensure that you have received the reservation ID from IBM technical sales. Reservation ID is a unique identifier to distinguish different IBM Cloud HPC service agreements. It must start with a letter and can only contain letters, numbers, hyphens (-), or underscores (_).
       default: ""
+    - name: eu_de_zone
+      default: ""
+      description: The IBM Cloud zone name within the selected region where the IBM Cloud HPC cluster should be deployed and requires a single zone input value. Supported zones are eu-de-2 and eu-de-3 for eu-de, us-east-1 and us-east-3 for us-east, and us-south-1 for us-south. The management nodes, file storage shares, and compute nodes will be deployed in the same zone.[Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
+    - name: eu_de_cluster_id
+      description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
+      default: ""
     - name: eu_de_reservation_id
       description: Ensure that you have received the reservation ID from IBM technical sales. Reservation ID is a unique identifier to distinguish different IBM Cloud HPC service agreements. It must start with a letter and can only contain letters, numbers, hyphens (-), or underscores (_).
       default: ""
+    - name: us_south_zone
+      default: ""
+      description: The IBM Cloud zone name within the selected region where the IBM Cloud HPC cluster should be deployed and requires a single zone input value. Supported zones are eu-de-2 and eu-de-3 for eu-de, us-east-1 and us-east-3 for us-east, and us-south-1 for us-south. The management nodes, file storage shares, and compute nodes will be deployed in the same zone.[Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
+    - name: us_south_cluster_id
+      description: Ensure that you have received the cluster ID from IBM technical sales. A unique identifer for HPC cluster used by IBM Cloud HPC to differentiate different HPC clusters within the same reservation. This can be up to 39 alphanumeric characters including the underscore (_), the hyphen (-), and the period (.) characters. You cannot change the cluster ID after deployment.
+      default: ""
     - name: us_south_reservation_id
       description: Ensure that you have received the reservation ID from IBM technical sales. Reservation ID is a unique identifier to distinguish different IBM Cloud HPC service agreements. It must start with a letter and can only contain letters, numbers, hyphens (-), or underscores (_).
       default: ""
@@ -105,8 +123,8 @@ spec:
             value: $(params.directory-name)
           - name: ssh_keys
             value: $(params.ssh_keys)
-          - name: zones
-            value: $(params.zones)
+          - name: zone
+            value: $(params.zone)
           - name: cluster_prefix
             value: $(params.cluster_prefix)
           - name: resource_group
@@ -123,10 +141,22 @@ spec:
             value: $(params.cluster_id)
           - name: reservation_id
             value: $(params.reservation_id)
+          - name: us_east_zone
+            value: $(params.us_east_zone)
+          - name: us_east_cluster_id
+            value: $(params.us_east_cluster_id)
           - name: us_east_reservation_id
             value: $(params.us_east_reservation_id)
+          - name: eu_de_zone
+            value: $(params.eu_de_zone)
+          - name: eu_de_cluster_id
+            value: $(params.eu_de_cluster_id)
           - name: eu_de_reservation_id
             value: $(params.eu_de_reservation_id)
+          - name: us_south_zone
+            value: $(params.us_south_zone)
+          - name: us_south_cluster_id
+            value: $(params.us_south_cluster_id)
           - name: us_south_reservation_id
             value: $(params.us_south_reservation_id)
         workspaces:

.tekton/git-pr-status/pipeline-git-pr-status.yaml

@@ -36,9 +36,9 @@ spec:
     - name: ssh_keys
       default: ""
       description: List of names of the SSH keys that is configured in your IBM Cloud account, used to establish a connection to the IBM Cloud HPC bastion and login node. Ensure that the SSH key is present in the same resource group and region where the cluster is being provisioned. If you do not have an SSH key in your IBM Cloud account, create one by according to [SSH Keys](https://cloud.ibm.com/docs/vpc?topic=vpc-ssh-keys).
-    - name: zones
+    - name: zone
       default: ""
-      description: IBM Cloud zone names within the selected region where the IBM Cloud HPC cluster should be deployed. Two zone names are required as input value and supported zones for eu-de are eu-de-2, eu-de-3 and for us-east us-east-1, us-east-3. The management nodes and file storage shares will be deployed to the first zone in the list. Compute nodes will be deployed across both first and second zones, where the first zone in the list will be considered as the most preferred zone for compute nodes deployment. [Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
+      description: The IBM Cloud zone name within the selected region where the IBM Cloud HPC cluster should be deployed and requires a single zone input value. Supported zones are eu-de-2 and eu-de-3 for eu-de, us-east-1 and us-east-3 for us-east, and us-south-1 for us-south. The management nodes, file storage shares, and compute nodes will be deployed in the same zone.[Learn more](https://cloud.ibm.com/docs/vpc?topic=vpc-creating-a-vpc-in-a-different-region#get-zones-using-the-cli).
     - name: cluster_prefix
       description: Prefix that is used to name the IBM Cloud HPC cluster and IBM Cloud resources that are provisioned to build the IBM Cloud HPC cluster instance. You cannot create more than one instance of the IBM Cloud HPC cluster with the same name. Ensure that the name is unique.
       default: cicd-wes
@@ -143,6 +143,8 @@ spec:
       params:
         - name: pipeline-debug
           value: $(params.pipeline-debug)
+        - name: repository
+          value: $(params.repository)
     - name: ssh-key-creation
       runAfter: [git-clone, pre-requisites-install]
       taskRef:
@@ -155,6 +157,8 @@ spec:
           value: $(params.pipeline-debug)
         - name: resource_group
           value: $(params.resource_group)
+        - name: pr-revision
+          value: $(params.pr-revision)
     - name: wes-hpc-da-rhel-pr
       runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
       taskRef:
@@ -169,8 +173,8 @@ spec:
           value: $(params.pipeline-debug)
         - name: ssh_keys
           value: $(params.ssh_keys)
-        - name: zones
-          value: $(params.zones)
+        - name: zone
+          value: $(params.zone)
         - name: cluster_prefix
           value: $(params.cluster_prefix)
         - name: resource_group
@@ -187,6 +191,8 @@ spec:
           value: $(params.cluster_id)
         - name: reservation_id
           value: $(params.reservation_id)
+        - name: pr-revision
+          value: $(params.pr-revision)
     - name: wes-hpc-da-ubuntu-pr
       runAfter: [git-clone, pre-requisites-install, ssh-key-creation]
       taskRef:
@@ -201,8 +207,8 @@ spec:
           value: $(params.pipeline-debug)
         - name: ssh_keys
           value: $(params.ssh_keys)
-        - name: zones
-          value: $(params.zones)
+        - name: zone
+          value: $(params.zone)
         - name: cluster_prefix
           value: $(params.cluster_prefix)
         - name: resource_group
@@ -219,6 +225,8 @@ spec:
           value: $(params.cluster_id)
         - name: reservation_id
           value: $(params.reservation_id)
+        - name: pr-revision
+          value: $(params.pr-revision)
     - name: ssh-key-deletion
       runAfter: [wes-hpc-da-rhel-pr, wes-hpc-da-ubuntu-pr]
       taskRef:
@@ -229,6 +237,64 @@ spec:
       params:
         - name: pipeline-debug
           value: $(params.pipeline-debug)
+        - name: pr-revision
+          value: $(params.pr-revision)
+    - name: display-test-run-pr-output-log
+      runAfter: [git-clone, set-git-pr-running, wes-hpc-da-rhel-pr, wes-hpc-da-ubuntu-pr]
+      workspaces:
+        - name: workspace
+          workspace: pipeline-ws
+      taskSpec:
+        workspaces:
+          - name: workspace
+            description: The git repo will be cloned onto the volume backing this workspace
+            mountPath: /artifacts
+        steps:
+          - name: test-run-output-pr-log-rhel-ubuntu
+            image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:latest
+            workingDir: "/artifacts"
+            command: ["/bin/bash", "-c"]
+            args:
+              - |
+                #!/bin/bash
+                DIRECTORY="/artifacts/tests"
+                if [ -d "$DIRECTORY" ]; then
+                  echo "*******************************************************"
+                  count=`ls -1 $DIRECTORY/test_output/log* 2>/dev/null | wc -l`
+                  if [ $count == 0 ]; then
+                    echo "Test Suite have not initated and log file not created, check with packages or binaries installation"
+                    exit 1
+                  else
+                    cat $DIRECTORY/test_output/log*
+                  fi
+                  echo "*******************************************************"
+                else
+                  echo "$DIRECTORY does not exits"
+                  exit 1
+                fi
+          - name: test-run-output-pr-log-rhel-ubuntu-error-check
+            image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:latest
+            workingDir: "/artifacts"
+            command: ["/bin/bash", "-c"]
+            args:
+              - |
+                #!/bin/bash
+                DIRECTORY="/artifacts/tests"
+                if [ -d "$DIRECTORY" ]; then
+                  echo "*******************************************************"
+                  if [ -d "$DIRECTORY" ]; then
+                    # Check any error message in the test run output log
+                    error_check=$(eval "grep -E -w 'FAIL|Error|ERROR' $DIRECTORY/test_output/log*")
+                    if [[ "$error_check" ]]; then
+                      echo "$error_check"
+                      echo "Found Error/FAIL/ERROR in the test run output log. Please check log."
+                    fi
+                  fi
+                  echo "*******************************************************"
+                else
+                  echo "$DIRECTORY does not exits"
+                  exit 1
+                fi
     - name: inspect-wes-hpc-infra-log
       runAfter: [git-clone, set-git-pr-running, wes-hpc-da-rhel-pr, wes-hpc-da-ubuntu-pr]
       workspaces:
@@ -241,14 +307,14 @@ spec:
             mountPath: /artifacts
         steps:
           - name: inspect-infra-error-rhel-pr
+            onError: continue
             image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:latest
             workingDir: "/artifacts"
             command: ["/bin/bash", "-c"]
             args:
               - |
                 #!/bin/bash
-                pwd
-                LOG_FILE="pipeline-TestRunBasic-rhel*"
+                LOG_FILE="pipeline-testrunbasic-rhel*"
                 DIRECTORY="/artifacts/tests"
                 if [ -d "$DIRECTORY" ]; then
                   # Check any error message on the plan/apply log
@@ -260,22 +326,18 @@ spec:
                   else
                     count=`ls -1 $DIRECTORY/test_output/log* 2>/dev/null | wc -l`
                     if [ $count == 0 ]; then
-                    echo "Test Suite have not initated and log file not created, check with packages or binaries installation"
-                    exit 1
-                    else
-                      echo "*******************************************************""
-                      cat $DIRECTORY/test_output/log*
-                      echo "*******************************************************""
-                      echo "No Error Found, infra got SUCCESS"
+                      echo "Test Suite have not initated and log file not created, check with packages or binaries installation"
+                      exit 1
                     fi
                   fi
                 else
                   echo "$DIRECTORY does not exits"
                   exit 1
                 fi
+
                 count=`ls -1 $DIRECTORY/*.cicd 2>/dev/null | wc -l`
                 if [ $count == 0 ]; then
-                  echo "Test Suite have not initated, check with packages or binaries installation"
+                  echo "Test Suite have not initated, check with packages or binaries installations"
                   exit 1
                 fi
           - name: inspect-infra-error-ubuntu-pr
@@ -285,8 +347,7 @@ spec:
             args:
               - |
                 #!/bin/bash
-                pwd
-                LOG_FILE="pipeline-TestRunBasic-ubuntu*"
+                LOG_FILE="pipeline-testrunbasic-ubuntu*"
                 DIRECTORY="/artifacts/tests"
                 if [ -d "$DIRECTORY" ]; then
                   # Check any error message on the plan/apply log
@@ -298,22 +359,18 @@ spec:
                   else
                     count=`ls -1 $DIRECTORY/test_output/log* 2>/dev/null | wc -l`
                     if [ $count == 0 ]; then
-                    echo "Test Suite have not initated and log file not created, check with packages or binaries installation"
-                    exit 1
-                    else
-                      echo "*******************************************************""
-                      cat $DIRECTORY/test_output/log*
-                      echo "*******************************************************""
-                      echo "No Error Found, infra got SUCCESS"
+                      echo "Test Suite have not initated and log file not created, check with packages or binaries installation"
+                      exit 1
                     fi
                   fi
                 else
                   echo "$DIRECTORY does not exits"
                   exit 1
                 fi
+
                 count=`ls -1 $DIRECTORY/*.cicd 2>/dev/null | wc -l`
                 if [ $count == 0 ]; then
-                  echo "Test Suite have not initated, check with packages or binaries installation"
+                  echo "Test Suite have not initated, check with packages or binaries installations"
                   exit 1
                 fi
   finally: