From a9c617db15b8b58ac5172c736e40f201162ec954 Mon Sep 17 00:00:00 2001
From: Manuel Kieweg <manuel.kieweg@h-da.de>
Date: Sat, 5 Jun 2021 11:59:01 +0200
Subject: [PATCH] change test endpoints
---
build/cd/deploy.go | 8 ++++----
build/ci/.test.yml | 2 +-
test/integration/cmdIntegration_test.go | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/build/cd/deploy.go b/build/cd/deploy.go
index 121bd08a7..7db5f70ec 100644
--- a/build/cd/deploy.go
+++ b/build/cd/deploy.go
@@ -370,8 +370,9 @@ func createIngress(env string) *netv1.Ingress {
APIVersion: "v1",
},
ObjectMeta: metav1.ObjectMeta{
- Name: env,
- Namespace: "cocsn",
+ Name: env,
+ Namespace: "cocsn",
+ Annotations: map[string]string{"nginx.ingress.kubernetes.io/grpc-backend": "true"},
},
Spec: netv1.IngressSpec{
Rules: []netv1.IngressRule{
@@ -381,10 +382,9 @@ func createIngress(env string) *netv1.Ingress {
HTTP: &netv1.HTTPIngressRuleValue{
Paths: []netv1.HTTPIngressPath{
{
- Path: "/api",
Backend: netv1.IngressBackend{
ServiceName: env,
- ServicePort: intstr.IntOrString{IntVal: 8080},
+ ServicePort: intstr.IntOrString{IntVal: 55055},
},
},
},
diff --git a/build/ci/.test.yml b/build/ci/.test.yml
index e4209b3bb..9324aa0e9 100644
--- a/build/ci/.test.yml
+++ b/build/ci/.test.yml
@@ -6,7 +6,7 @@ integration-test:
- job: "deploy:integration-test"
variables:
GOSDN_LOG: "nolog"
- GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de/api
+ GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de
rules:
- if: $CI_NIGHTLY
when: delayed
diff --git a/test/integration/cmdIntegration_test.go b/test/integration/cmdIntegration_test.go
index dd24e37ca..8f88a4328 100644
--- a/test/integration/cmdIntegration_test.go
+++ b/test/integration/cmdIntegration_test.go
@@ -19,7 +19,7 @@ const unreachable = "203.0.113.10:6030"
const testPath = "/system/config/hostname"
var testAddress = "141.100.70.171:6030"
-var testAPIEndpoint = "http://gosdn-latest.apps.ocp.fbi.h-da.de/api"
+var testAPIEndpoint = "http://gosdn-latest.apps.ocp.fbi.h-da.de"
var testUsername = "admin"
var testPassword = "arista"
var opt *tpb.TransportOption
--
GitLab