WIP: Core automation merge

Dockerfile.interop

@@ -0,0 +1,31 @@
+# Command to build this Dockerfile
+# docker build -f Dockerfile -t quay.io/vboulos/acmqe-automation/obs:obs-ginkgo_1_14_2-linux-go .
+
+FROM quay.io/vboulos/acmqe-automation/ginkgo_1_14_2-linux-go
+
+
+# Copy the Obs repo repo into /tmp/obs folder
+RUN mkdir /tmp/obs
+WORKDIR /tmp/obs
+COPY . .
+
+# good colors for most applications
+ENV TERM=xterm
+
+# Set required permissions for OpenShift usage
+RUN chgrp -R 0 /tmp && \
+    chmod -R g=u /tmp
+
+RUN mkdir -p /go
+RUN chgrp -R 0 /go && \
+    chmod -R g=u /go
+
+RUN mkdir -p ~/.kube
+RUN chgrp -R 0 ~/.kube && \
+    chmod -R g=u ~/.kube
+
+RUN mkdir -p /alabama/.kube
+RUN chgrp -R 0 /alabama/.kube && \
+    chmod -R g=u /alabama/.kube
+
+CMD ["/bin/bash"]

Jenkinsfile

@@ -0,0 +1,122 @@
+pipeline {
+    options {
+        buildDiscarder(logRotator(daysToKeepStr: '30'))
+    }
+    agent {
+        docker {
+	    image 'quay.io/vboulos/acmqe-automation/ginkgo_1_14_2-linux-go'
+            args '--network host -u 0:0'
+        }
+    }
+    parameters {
+        string(name:'CLOUD_PROVIDER', defaultValue: '', description: 'Cloud provider, OCP and ACM version information, like VMWARE-412-264, AWS-411')
+        string(name:'HUB_CLUSTER_NAME', defaultValue: '', description: 'Name of Hub cluster')
+        string(name:'BASE_DOMAIN', defaultValue: '', description: 'Base domain of Hub cluster')
+        string(name:'OC_CLUSTER_USER', defaultValue: 'kubeadmin', description: 'OCP Hub User Name')
+        string(name:'OC_HUB_CLUSTER_PASS', defaultValue: '', description: 'OCP Hub Password')
+        string(name:'OC_HUB_CLUSTER_API_URL', defaultValue: '', description: 'OCP Hub API URL')
+        string(name:'MANAGED_CLUSTER_NAME', defaultValue: '', description: 'Managed cluster name')
+        string(name:'MANAGED_CLUSTER_BASE_DOMAIN', defaultValue: '', description: 'Managed cluster base domain')
+        string(name:'MANAGED_CLUSTER_USER', defaultValue: 'kubeadmin', description: 'Managed Cluster User Name')
+        string(name:'MANAGED_CLUSTER_PASS', defaultValue: '', description: 'Managed cluster Password')
+        string(name:'MANAGED_CLUSTER_API_URL', defaultValue: '', description: 'Managed cluster API URL')
+        string(name:'BUCKET', defaultValue: 'obs-auto-bucket', description: 'Bucket name')
+        string(name:'REGION', defaultValue: 'us-east-1', description: 'Bucket region')
+        password(name:'AWS_ACCESS_KEY_ID', defaultValue: '', description: 'AWS access key ID')
+        password(name:'AWS_SECRET_ACCESS_KEY', defaultValue: '', description: 'AWS secret access key')
+        string(name:'SKIP_INSTALL_STEP', defaultValue: 'false', description: 'Skip Observability installation')
+        string(name:'SKIP_UNINSTALL_STEP', defaultValue: 'true', description: 'Skip Observability uninstallation')
+        string(name:'TAGGING', defaultValue: '', description: 'with tagging value to run the specific test cases')
+        string(name:'USE_MINIO', defaultValue: 'false', description: 'If no AWS S3 bucket, you could use minio as object storage to instead')
+    }
+    environment {
+        CI = 'true'
+        AWS_SECRET_ACCESS_KEY = credentials('cqu_aws_secret_access_key')  
+        AWS_ACCESS_KEY_ID = credentials('cqu_aws_access_key')
+    }
+    stages {
+        stage('Test Run') {
+            steps {
+                sh """
+                export CLOUD_PROVIDER="${params.CLOUD_PROVIDER}"
+                export OC_CLUSTER_USER="${params.OC_CLUSTER_USER}"
+                set +x
+                export OC_HUB_CLUSTER_PASS="${params.OC_HUB_CLUSTER_PASS}"
+                set -x
+                export OC_HUB_CLUSTER_API_URL="${params.OC_HUB_CLUSTER_API_URL}"
+                BASE_DOMAIN=\$(echo \${OC_HUB_CLUSTER_API_URL} | awk -F'https://api\\.|:' '{print \$2}')
+                HUB_CLUSTER_NAME=\$(echo \$BASE_DOMAIN | cut -d'.' -f1)
+                echo "BASE_DOMAIN: \$BASE_DOMAIN"
+                echo "HUB_CLUSTER_NAME: \$HUB_CLUSTER_NAME"
+                export HUB_CLUSTER_NAME="\$HUB_CLUSTER_NAME"
+                export BASE_DOMAIN="\$BASE_DOMAIN"
+                export MANAGED_CLUSTER_NAME="${params.MANAGED_CLUSTER_NAME}"
+                export MANAGED_CLUSTER_BASE_DOMAIN="${params.MANAGED_CLUSTER_BASE_DOMAIN}"
+                export MANAGED_CLUSTER_USER="${params.MANAGED_CLUSTER_USER}"
+                set +x
+                export MANAGED_CLUSTER_PASS="${params.MANAGED_CLUSTER_PASS}"
+                set -x
+                export MANAGED_CLUSTER_API_URL="${params.MANAGED_CLUSTER_API_URL}"
+                export BUCKET="${params.BUCKET}"
+                export REGION="${params.REGION}"
+                export SKIP_INSTALL_STEP="${params.SKIP_INSTALL_STEP}"
+                export SKIP_UNINSTALL_STEP="${params.SKIP_UNINSTALL_STEP}"
+                export TAGGING="${params.TAGGING}"
+                export USE_MINIO="${params.USE_MINIO}"
+                export IS_CANARY_ENV=true
+
+                if [[ -n "${params.AWS_ACCESS_KEY_ID}" ]]; then
+                    export AWS_ACCESS_KEY_ID="${params.AWS_ACCESS_KEY_ID}"
+                fi
+
+                if [[ -n "${params.AWS_SECRET_ACCESS_KEY}" ]]; then
+                    export AWS_SECRET_ACCESS_KEY="${params.AWS_SECRET_ACCESS_KEY}"
+                fi
+
+                if [[ "${params.USE_MINIO}" == true ]]; then
+                  export IS_CANARY_ENV=false
+                fi                 
+                if [[ -z "${OC_CLUSTER_USER}" || -z "${OC_HUB_CLUSTER_PASS}" || -z "${OC_HUB_CLUSTER_API_URL}" ]]; then
+                    echo "Aborting test.. OCP HUB details are required for the test execution"
+                    exit 1
+                else
+		    if [[ -n "${params.MANAGED_CLUSTER_USER}" && -n "${params.MANAGED_CLUSTER_PASS}" && -n "${params.MANAGED_CLUSTER_API_URL}" ]]; then
+                      set +x
+                      oc login --insecure-skip-tls-verify -u \$MANAGED_CLUSTER_USER -p \$MANAGED_CLUSTER_PASS \$MANAGED_CLUSTER_API_URL
+                      set -x
+                      oc config view --minify --raw=true > ~/.kube/managed_kubeconfig
+                      export MAKUBECONFIG=~/.kube/managed_kubeconfig
+                    fi
+                    set +x
+                    oc login --insecure-skip-tls-verify -u \$OC_CLUSTER_USER -p \$OC_HUB_CLUSTER_PASS \$OC_HUB_CLUSTER_API_URL
+                    set -x
+                    export KUBECONFIG=~/.kube/config
+                    go mod vendor && ginkgo build ./tests/pkg/tests/
+                    rm -rf tests/pkg/tests/*.xml
+                    cd tests
+                    cp resources/options.yaml.template resources/options.yaml
+                    /usr/local/bin/yq e -i '.options.hub.name="'"\$HUB_CLUSTER_NAME"'"' resources/options.yaml
+                    /usr/local/bin/yq e -i '.options.hub.baseDomain="'"\$BASE_DOMAIN"'"' resources/options.yaml
+                    /usr/local/bin/yq e -i '.options.clusters.name="'"\$MANAGED_CLUSTER_NAME"'"' resources/options.yaml
+                    /usr/local/bin/yq e -i '.options.clusters.baseDomain="'"\$MANAGED_CLUSTER_BASE_DOMAIN"'"' resources/options.yaml
+                    /usr/local/bin/yq e -i '.options.clusters.kubeconfig="'"\$MAKUBECONFIG"'"' resources/options.yaml
+                    cat resources/options.yaml
+                    if [[ -n "${params.TAGGING}" ]]; then
+                    ginkgo --focus="\$TAGGING" -v pkg/tests/ -- -options=../../resources/options.yaml -v=5
+                    else
+                    ginkgo -v pkg/tests/ -- -options=../../resources/options.yaml -v=5
+                    fi
+                fi
+                """
+            }
+        }
+
+
+    }
+    post {
+        always {
+            archiveArtifacts artifacts: 'tests/pkg/tests/*.xml', followSymlinks: false
+            junit 'tests/pkg/tests/*.xml'
+        }
+    }
+}

execute_obs_interop_commands.sh

@@ -0,0 +1,68 @@
+#!/bin/bash
+
+export PARAM_AWS_SECRET_ACCESS_KEY=${PARAM_AWS_SECRET_ACCESS_KEY:-}
+export PARAM_AWS_ACCESS_KEY_ID=${PARAM_AWS_ACCESS_KEY_ID:-}
+export CLOUD_PROVIDER=${CLOUD_PROVIDER:-}
+export OC_CLUSTER_USER=${OC_CLUSTER_USER:-}
+export OC_HUB_CLUSTER_PASS=${OC_HUB_CLUSTER_PASS:-}
+export OC_HUB_CLUSTER_API_URL=${OC_HUB_CLUSTER_API_URL:-}
+export HUB_CLUSTER_NAME=${HUB_CLUSTER_NAME:-}
+export BASE_DOMAIN=${BASE_DOMAIN:-}
+export MANAGED_CLUSTER_NAME=${MANAGED_CLUSTER_NAME:-}
+export MANAGED_CLUSTER_BASE_DOMAIN=${MANAGED_CLUSTER_BASE_DOMAIN:-}
+export MANAGED_CLUSTER_USER=${MANAGED_CLUSTER_USER:-}
+export MANAGED_CLUSTER_PASS=${MANAGED_CLUSTER_PASS:-}
+export MANAGED_CLUSTER_API_URL=${MANAGED_CLUSTER_API_URL}
+export BUCKET=${BUCKET:-'obs-v1'}
+export REGION=${REGION:-'us-east-1'}
+export USE_MINIO=${USE_MINIO:-'false'}
+export SKIP_INSTALL_STEP=${SKIP_INSTALL_STEP:-'false'}
+export SKIP_UNINSTALL_STEP=${SKIP_UNINSTALL_STEP:-'true'}
+export TAGGING=${TAGGING:-}
+
+if [[ -n ${PARAM_AWS_ACCESS_KEY_ID} ]]; then
+  export AWS_ACCESS_KEY_ID=${PARAM_AWS_ACCESS_KEY_ID}
+fi
+
+if [[ -n ${PARAM_AWS_SECRET_ACCESS_KEY} ]]; then
+  export AWS_SECRET_ACCESS_KEY=${PARAM_AWS_SECRET_ACCESS_KEY}
+fi
+
+# if [[ ${!USE_MINIO} == "false" ]]; then
+#     export IS_CANARY_ENV=true
+# fi
+
+export IS_CANARY_ENV=true
+
+if [[ -z ${HUB_CLUSTER_NAME} || -z ${BASE_DOMAIN} || -z ${OC_CLUSTER_USER} || -z ${OC_HUB_CLUSTER_PASS} || -z ${OC_HUB_CLUSTER_API_URL} ]]; then
+  echo "Aborting test.. OCP HUB details are required for the test execution"
+  exit 1
+else
+  if [[ -n ${MANAGED_CLUSTER_USER} && -n ${MANAGED_CLUSTER_PASS} && -n ${MANAGED_CLUSTER_API_URL} ]]; then
+    oc login --insecure-skip-tls-verify -u $MANAGED_CLUSTER_USER -p $MANAGED_CLUSTER_PASS $MANAGED_CLUSTER_API_URL
+    oc config view --minify --raw=true >~/.kube/managed_kubeconfig
+    export MAKUBECONFIG=~/.kube/managed_kubeconfig
+  fi
+  set +x
+  oc login --insecure-skip-tls-verify -u $OC_CLUSTER_USER -p $OC_HUB_CLUSTER_PASS $OC_HUB_CLUSTER_API_URL
+  set -x
+
+  oc config view --minify --raw=true >userfile
+  //cat userfile
+  whoami
+  rm -rf ~/.kube/config
+  cp userfile ~/.kube/config
+  //cat ~/.kube/config
+  export KUBECONFIG=~/.kube/config
+
+  go mod vendor && ginkgo build ./tests/pkg/tests/
+  cd tests
+  cp resources/options.yaml.template resources/options.yaml
+  /usr/local/bin/yq e -i '.options.hub.name="'"$HUB_CLUSTER_NAME"'"' resources/options.yaml
+  /usr/local/bin/yq e -i '.options.hub.baseDomain="'"$BASE_DOMAIN"'"' resources/options.yaml
+  /usr/local/bin/yq e -i '.options.clusters.name="'"$MANAGED_CLUSTER_NAME"'"' resources/options.yaml
+  /usr/local/bin/yq e -i '.options.clusters.baseDomain="'"$MANAGED_CLUSTER_BASE_DOMAIN"'"' resources/options.yaml
+  /usr/local/bin/yq e -i '.options.clusters.kubeconfig="'"$MAKUBECONFIG"'"' resources/options.yaml
+  cat resources/options.yaml
+  ginkgo --focus=$TAGGING -v pkg/tests/ -- -options=../../resources/options.yaml -v=5
+fi

tests/pkg/tests/observability-e2e-test_suite_test.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -217,19 +218,37 @@ func initVars() {
 		testOptions.KubeConfig = kubeconfig
 	}
 
+	cloudProvider := strings.ToLower(os.Getenv("CLOUD_PROVIDER"))
+	substring1 := "rosa"
+	substring2 := "hcp"
 	if testOptions.HubCluster.BaseDomain != "" {
 		baseDomain = testOptions.HubCluster.BaseDomain
-
 		if testOptions.HubCluster.ClusterServerURL == "" {
-			testOptions.HubCluster.ClusterServerURL = fmt.Sprintf(
-				"https://api.%s:6443",
-				testOptions.HubCluster.BaseDomain,
-			)
+			// TODO: Simplify
+			if strings.Contains(cloudProvider, substring1) && strings.Contains(cloudProvider, substring2) {
+
+				testOptions.HubCluster.ClusterServerURL = fmt.Sprintf(
+					"https://api.%s:443",
+					testOptions.HubCluster.BaseDomain,
+				)
+			} else {
+				testOptions.HubCluster.ClusterServerURL = fmt.Sprintf(
+					"https://api.%s:6443",
+					testOptions.HubCluster.BaseDomain,
+				)
+			}
 		}
 	} else {
 		Expect(baseDomain).NotTo(BeEmpty(), "The `baseDomain` is required.")
 		testOptions.HubCluster.BaseDomain = baseDomain
 		testOptions.HubCluster.ClusterServerURL = fmt.Sprintf("https://api.%s:6443", baseDomain)
+		// TODO: Simplify
+		if strings.Contains(cloudProvider, substring1) && strings.Contains(cloudProvider, substring2) {
+
+			testOptions.HubCluster.ClusterServerURL = fmt.Sprintf("https://api.%s:443", baseDomain)
+		} else {
+			testOptions.HubCluster.ClusterServerURL = fmt.Sprintf("https://api.%s:6443", baseDomain)
+		}
 	}
 
 	if testOptions.HubCluster.User != "" {