fix: Integration tests (#339)

keptn-contrib · Jul 8, 2022 · a5112a6 · a5112a6
1 parent 801fd51
commit a5112a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -175,8 +175,6 @@ jobs:
             prometheus-service ./dist/helm-charts/prometheus-service-*.tgz \
             -n keptn \
             --wait
-          
-          kubectl apply -n monitoring -f deploy/role.yaml
 
       # If we failed any previous step we might have a problem and not reporting anything for the version
       - name: Create pipeline failure report
@@ -208,13 +206,13 @@ jobs:
           kubectl cluster-info dump > k8s_debug/k8s_cluster_info_dump.txt
           kubectl get all -n keptn -o json > k8s_debug/k8s_keptn_objects.json
           kubectl get configmaps,deployments,pods,networkpolicy,serviceaccounts,role,rolebindings,events -n ${JES_NAMESPACE} -o json > k8s_debug/k8s_jes_objects.json
-          kubectl logs -n keptn -l app.kubernetes.io/instance=keptn --prefix=true --previous=false --all-containers > k8s_debug/k8s_keptn_logs.txt || true
-          kubectl logs -n ${JES_NAMESPACE} deployment/job-executor-service --prefix=true --previous=false --all-containers > k8s_debug/k8s_jes_logs.txt || true
-          kubectl logs deployment/keptn-gitea-provisioner-service --prefix=true --previous=false --all-containers > k8s_debug/k8s_gitea_provisioner_logs.txt || true
+          kubectl logs -n keptn -l app.kubernetes.io/instance=keptn --prefix=true --previous=false --all-containers --tail=-1 > k8s_debug/k8s_keptn_logs.txt || true
+          kubectl logs -n ${JES_NAMESPACE} deployment/job-executor-service --prefix=true --previous=false --all-containers --tail=-1 > k8s_debug/k8s_jes_logs.txt || true
+          kubectl logs deployment/keptn-gitea-provisioner-service --prefix=true --previous=false --all-containers --tial=-1 > k8s_debug/k8s_gitea_provisioner_logs.txt || true
           kubectl get statefulsets,configmaps,pods,networkpolicy,serviceaccounts,role,rolebindings,events,services -n ${GITEA_NAMESPACE} -o json > k8s_debug/k8s_objects_gitea.json
-          kubectl logs statefulsets/gitea --prefix=true --previous=false --all-containers -n ${GITEA_NAMESPACE} > k8s_debug/k8s_logs_gitea.txt || true
+          kubectl logs statefulsets/gitea --prefix=true --previous=false --all-containers -n ${GITEA_NAMESPACE} --tail=-1 > k8s_debug/k8s_logs_gitea.txt || true
           kubectl get daemonsets,configmaps,pods,serviceaccounts,role,rolebindings,events,services -n monitoring -o json > k8s_debug/k8s_objects_prometheus.json
-          kubectl logs deployment/prometheus-alertmanager --prefix=true --previous=false --all-containers -n monitoring > k8s_debug/k8s_logs_prometheus-alertmanager.txt || true
+          kubectl logs deployment/prometheus-alertmanager --prefix=true --previous=false --all-containers -n monitoring --tail=-1 > k8s_debug/k8s_logs_prometheus-alertmanager.txt || true
 
       # Upload the k8s debug archive, so we can use it for investigating
       - name: Upload k8s debug archive

diff --git a/test/e2e/utils.go b/test/e2e/utils.go
@@ -272,12 +272,7 @@ func NewK8sClient() (*kubernetes.Clientset, error) {
 	// Get full path of the kubeconfig file:
 	var kubeconfig string
 	if os.Getenv("KUBECONFIG") != "" {
-		kubeconfigPath := os.Getenv("KUBECONFIG")
-		userHomeDir, err := os.UserHomeDir()
-		if err != nil {
-			return nil, fmt.Errorf("unable to get user home dir: %w", err)
-		}
-		kubeconfig = filepath.Join(userHomeDir, kubeconfigPath)
+		kubeconfig = os.Getenv("KUBECONFIG")
 	} else {
 		userHomeDir, err := os.UserHomeDir()
 		if err != nil {