Merge pull request #293 from arangodb/bug-fix/fix-semiautomation

neunhoef · web-flow · commit 1c3ea60ee2d8 · 2018-11-06T11:06:34.000+01:00
Fixes for semiautomation.
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
@@ -0,0 +1,17 @@
+apiVersion: "database.arangodb.com/v1alpha"
+kind: "ArangoDeployment"
+metadata:
+  name: "acceptance-cluster1"
+spec:
+  environment: @ENVIRONMENT@
+  image: @IMAGE@
+  disableIPv6: @DISABLEIPV6@
+  externalAccess:
+    type: LoadBalancer
+  mode: Cluster
+  sync:
+    enabled: true
+    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
@@ -99,7 +99,12 @@ function patchYamlFile
   set -l RESULT $argv[4]
   cp "$YAMLFILE" "$RESULT"
   sed -i "s|@IMAGE@|$IMAGE|" "$RESULT"
-  sed -i "s|@ENVIRONMENT|$ENVIRONMENT|" "$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
@@ -108,5 +113,3 @@ function checkImages
     exit 1
   end
 end
-
-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
diff --git a/tests/acceptance/semiautomation/test1a.fish b/tests/acceptance/semiautomation/test1a.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test1a
 set -g TESTDESC "Deployment of mode single (development)"
diff --git a/tests/acceptance/semiautomation/test1b.fish b/tests/acceptance/semiautomation/test1b.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test1b
 set -g TESTDESC "Deployment of mode active/failover (development)"
diff --git a/tests/acceptance/semiautomation/test1c.fish b/tests/acceptance/semiautomation/test1c.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test1c
 set -g TESTDESC "Deployment of mode cluster (development, enterprise)"
diff --git a/tests/acceptance/semiautomation/test1d.fish b/tests/acceptance/semiautomation/test1d.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test1d
 set -g TESTDESC "Deployment of mode cluster with sync (development, enterprise)"
diff --git a/tests/acceptance/semiautomation/test2a.fish b/tests/acceptance/semiautomation/test2a.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test2a
 set -g TESTDESC "Scale an active failover deployment (enterprise, development)"
diff --git a/tests/acceptance/semiautomation/test2b.fish b/tests/acceptance/semiautomation/test2b.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test2b
 set -g TESTDESC "Scale a cluster deployment (development, enterprise)"
diff --git a/tests/acceptance/semiautomation/test3a.fish b/tests/acceptance/semiautomation/test3a.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test3a
 set -g TESTDESC "Deployment of mode single (production)"
diff --git a/tests/acceptance/semiautomation/test3b.fish b/tests/acceptance/semiautomation/test3b.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test3b
 set -g TESTDESC "Deployment of mode active/failover (production)"
diff --git a/tests/acceptance/semiautomation/test3c.fish b/tests/acceptance/semiautomation/test3c.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test3c
 set -g TESTDESC "Deployment of mode cluster (production, enterprise)"
diff --git a/tests/acceptance/semiautomation/test3d.fish b/tests/acceptance/semiautomation/test3d.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test3d
 set -g TESTDESC "Scale a cluster deployment (production, enterprise)"
diff --git a/tests/acceptance/semiautomation/test4a.fish b/tests/acceptance/semiautomation/test4a.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test4a
 set -g TESTDESC "Deployment of mode cluster (development, enterprise, local storage)"
diff --git a/tests/acceptance/semiautomation/test4b.fish b/tests/acceptance/semiautomation/test4b.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test4a
 set -g TESTDESC "Deployment of mode cluster (development, enterprise, local storage)"
diff --git a/tests/acceptance/semiautomation/test5a.fish b/tests/acceptance/semiautomation/test5a.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test5a
 set -g TESTDESC "Pod resilience in mode single (production)"
diff --git a/tests/acceptance/semiautomation/test5b.fish b/tests/acceptance/semiautomation/test5b.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test5b
 set -g TESTDESC "Pod resilience in active/failover (production)"
diff --git a/tests/acceptance/semiautomation/test5c.fish b/tests/acceptance/semiautomation/test5c.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test5c
 set -g TESTDESC "Pod resilience in mode cluster (production, enterprise)"
diff --git a/tests/acceptance/semiautomation/test6a.fish b/tests/acceptance/semiautomation/test6a.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6a
 set -g TESTDESC "Node resilience in mode single (production)"
diff --git a/tests/acceptance/semiautomation/test6b.fish b/tests/acceptance/semiautomation/test6b.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6b
 set -g TESTDESC "Node resilience in active/failover (production)"
diff --git a/tests/acceptance/semiautomation/test6c.fish b/tests/acceptance/semiautomation/test6c.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6c
 set -g TESTDESC "Node resilience in mode cluster (production, enterprise)"
diff --git a/tests/acceptance/semiautomation/test6d.fish b/tests/acceptance/semiautomation/test6d.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6d
 set -g TESTDESC "Node resilience in mode single (production)"
diff --git a/tests/acceptance/semiautomation/test6e.fish b/tests/acceptance/semiautomation/test6e.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6e
 set -g TESTDESC "Node resilience in active/failover (production)"
diff --git a/tests/acceptance/semiautomation/test6f.fish b/tests/acceptance/semiautomation/test6f.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6f
 set -g TESTDESC "Node resilience in mode cluster (production, enterprise)"
diff --git a/tests/acceptance/semiautomation/test6g.fish b/tests/acceptance/semiautomation/test6g.fish
@@ -1,6 +1,7 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test6g
 set -g TESTDESC "Node resilience in active/failover, repl factor 1 (production)"
diff --git a/tests/acceptance/semiautomation/test7a.fish b/tests/acceptance/semiautomation/test7a.fish
@@ -1,12 +1,13 @@
 #!/usr/bin/fish
 
 source helper.fish
+checkImages
 
 set -g TESTNAME test7a
 set -g TESTDESC "Deployment of 2 clusters with sync with DC2DC (production, enterprise)"
-set -g YAMLFILE cluster-sync.yaml
+set -g YAMLFILE cluster-sync1.yaml
 set -g YAMLFILE2 cluster-sync2.yaml
-set -g DEPLOYMENT acceptance-cluster
+set -g DEPLOYMENT acceptance-cluster1
 set -g DEPLOYMENT2 acceptance-cluster2
 printheader
 
@@ -37,6 +38,11 @@ and waitForKubectl "get service" "$DEPLOYMENT2-ea *LoadBalancer" "-v;pending" 1
 and waitForKubectl "get service" "$DEPLOYMENT2-sync *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
+# Deploy secrets separately for sync to pick them up:
+kubectl get secret src-accesspackage --template='{{index .data "accessPackage.yaml"}}' | base64 -d > accessPackage.yaml
+and kubectl apply -f accessPackage.yaml
+or fail "Could not redeploy secrets for replication auth."
+
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
 testArangoDB $ip 120
