Add disableIPv6 switch and try to fix auth for test7a

arangodb · Nov 6, 2018 · 8188d3a · 8188d3a
1 parent 37f3184
commit 8188d3a
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 1 deletion.
diff --git a/tests/acceptance/semiautomation/activefailover.yaml b/tests/acceptance/semiautomation/activefailover.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: ActiveFailover
diff --git a/tests/acceptance/semiautomation/cluster-local-storage.yaml b/tests/acceptance/semiautomation/cluster-local-storage.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: Cluster

diff --git a/tests/acceptance/semiautomation/cluster-sync.yaml b/tests/acceptance/semiautomation/cluster-sync.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: Cluster

diff --git a/tests/acceptance/semiautomation/cluster-sync1.yaml b/tests/acceptance/semiautomation/cluster-sync1.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: Cluster
@@ -13,3 +14,4 @@ spec:
     externalAccess:
       type: LoadBalancer
       accessPackageSecretNames: ["src-accesspackage"]
+      masterEndpoint: ["https://src-sync.9hoeffer.de:8629"]
diff --git a/tests/acceptance/semiautomation/cluster-sync2.yaml b/tests/acceptance/semiautomation/cluster-sync2.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: Cluster

diff --git a/tests/acceptance/semiautomation/cluster.yaml b/tests/acceptance/semiautomation/cluster.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: Cluster
diff --git a/tests/acceptance/semiautomation/helper.fish b/tests/acceptance/semiautomation/helper.fish
@@ -100,6 +100,11 @@ function patchYamlFile
   cp "$YAMLFILE" "$RESULT"
   sed -i "s|@IMAGE@|$IMAGE|" "$RESULT"
   sed -i "s|@ENVIRONMENT@|$ENVIRONMENT|" "$RESULT"
+  if test -z "$DISABLEIPV6"
+    sed -i "s|@DISABLEIPV6@|false|" "$RESULT"
+  else
+    sed -i "s|@DISABLEIPV6@|true|" "$RESULT"
+  end
 end
 
 function checkImages

diff --git a/tests/acceptance/semiautomation/replication.yaml b/tests/acceptance/semiautomation/replication.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "replication-internal"
 spec:
   source:
-    masterEndpoint: ["https://@ADDRESS@:8629"]
+    masterEndpoint: ["https://src-sync.9hoeffer.de:8629"]
     auth:
       keyfileSecretName: src-accesspackage-auth
     tls:

diff --git a/tests/acceptance/semiautomation/single.yaml b/tests/acceptance/semiautomation/single.yaml
@@ -5,6 +5,7 @@ metadata:
 spec:
   environment: @ENVIRONMENT@
   image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
   externalAccess:
     type: LoadBalancer
   mode: Single