From 2983b085272b6ec32fac9dfa24dcae709f049ba1 Mon Sep 17 00:00:00 2001 From: Avinal Kumar Date: Tue, 6 Jun 2023 14:51:32 +0530 Subject: [PATCH] test forward update --- .tekton/pipeline-service-test.yaml | 2 +- .../tasks/tekton-results-upstream-e2e.yaml | 21 +++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.tekton/pipeline-service-test.yaml b/.tekton/pipeline-service-test.yaml index fc03bd735..9c33260e0 100644 --- a/.tekton/pipeline-service-test.yaml +++ b/.tekton/pipeline-service-test.yaml @@ -29,7 +29,7 @@ spec: - name: target_branch value: "{{ target_branch }}" - name: results_url - value: "https://github.com/openshift-pipelines/tektoncd-results" + value: "https://github.com/avinal/tektoncd-results" timeouts: pipeline: "1h0m0s" workspaces: diff --git a/.tekton/tasks/tekton-results-upstream-e2e.yaml b/.tekton/tasks/tekton-results-upstream-e2e.yaml index 33eb49020..bac38a381 100644 --- a/.tekton/tasks/tekton-results-upstream-e2e.yaml +++ b/.tekton/tasks/tekton-results-upstream-e2e.yaml @@ -31,25 +31,14 @@ spec: mkdir -p ${SA_TOKEN_PATH} ${SSL_CERT_PATH} kubectl get secrets tekton-results-tls -n tekton-results --template='{{index .data "tls.crt"}}' | base64 -d > ${SSL_CERT_PATH}/tekton-results-cert.pem kubectl get secrets tekton-results-tls -n tekton-results --template='{{index .data "tls.key"}}' | base64 -d > ${SSL_CERT_PATH}/tekton-results-key.pem + oc annotate ingresses.config/cluster ingress.operator.openshift.io/default-enable-http2=true kubectl apply -f ./test/e2e/kustomize/rbac.yaml service_accounts=(all-namespaces-read-access single-namespace-read-access) for service_account in "${service_accounts[@]}"; do kubectl create token "$service_account" > "${SA_TOKEN_PATH}"/"$service_account" done - RESULT_ROUTE=$(kubectl get route tekton-results -n tekton-results --template='{{.spec.host}}') - cat < patch-test-config.patch - diff --git a/test/e2e/grpc_client.go b/test/e2e/grpc_client.go - --- a/test/e2e/grpc_client.go - +++ b/test/e2e/grpc_client.go - @@ -36,4 +36,4 @@ const ( - certFile = "tekton-results-cert.pem" - - apiServerName = "tekton-results-api-service.tekton-pipelines.svc.cluster.local" - - apiServerAddress = "localhost:50051" - + apiServerName = "tekton-results-api-service.tekton-results.svc.cluster.local" - + apiServerAddress = "$RESULT_ROUTE" - defCertFolder = "/tmp/tekton-results/ssl" - - EOF - git apply patch-test-config.patch + export API_SERVER_NAME="tekton-results-api-service.tekton-results.svc.cluster.local" + export API_SERVER_ADDR="https://$(kubectl get route tekton-results -n tekton-results --template='{{.spec.host}}'):443" + echo $API_SERVER_ADDR export CGO_ENABLED=0 - go test -v -count=1 --tags=e2e ./test/e2e/... + go test -v -count=1 --tags=e2e $(go list --tags=e2e ./test/e2e/... | grep -v /client)