More tests ready.

neunhoef · neunhoef · commit 01534b537045 · 2018-10-31T16:07:54.000+01:00
diff --git a/tests/acceptance/cluster-local-storage.template.yaml b/tests/acceptance/cluster-local-storage.template.yaml
@@ -8,4 +8,7 @@ spec:
   externalAccess:
     type: LoadBalancer
   mode: Cluster
-  storageClassName: acceptance
+  agents:
+    storageClassName: acceptance
+  dbservers:
+    storageClassName: acceptance
diff --git a/tests/acceptance/cluster-sync.template.yaml b/tests/acceptance/cluster-sync.template.yaml
@@ -10,3 +10,5 @@ spec:
   mode: Cluster
   sync:
     enabled: true
+    externalAccess:
+      type: LoadBalancer
diff --git a/tests/acceptance/generate.sh b/tests/acceptance/generate.sh
@@ -5,6 +5,8 @@ version="arangodb-preview:3.4.0-rc.3"
 enterprise_secret="$ARANGO_EP_SECRET" #only the number
 community="arangodb/$version"
 enterprise="registry.arangodb.com/arangodb/$version-$enterprise_secret"
+community="neunhoef/arangodb:3.4"
+enterprise="neunhoef/arangodb:3.4"
 
 rm -fr generated
 mkdir -p generated
diff --git a/tests/acceptance/local-storage.template.yaml b/tests/acceptance/local-storage.template.yaml
@@ -0,0 +1,9 @@
+apiVersion: "storage.arangodb.com/v1alpha"
+kind: "ArangoLocalStorage"
+metadata:
+  name: "acceptance-local-storage"
+spec:
+  storageClass:
+    name: acceptance
+  localPath:
+  - /var/lib/acceptance-test
diff --git a/tests/acceptance/semiautomation/helper.fish b/tests/acceptance/semiautomation/helper.fish
@@ -45,6 +45,7 @@ function output
   if which say > /dev/null
     say $argv[1] > /dev/null ^ /dev/null
   end
+  echo
   for l in $argv[2..-1] ; echo $l ; end
 end
 
@@ -55,6 +56,7 @@ end
 function inputAndLogResult
   read -P "Test result: " result
   log $result
+  echo
 end
 
 function waitForUser
@@ -81,9 +83,11 @@ function testArangoDB
       return 1
     end
     echo Waiting "$n($timeout)"...
+    sleep 1
   end
 end
 
 function fail
   output "Failed" $argv
+  exit 1
 end
diff --git a/tests/acceptance/semiautomation/test1a.fish b/tests/acceptance/semiautomation/test1a.fish
@@ -3,7 +3,7 @@
 source helper.fish
 
 set -g TESTNAME test1a
-set -g TESTDESC "Deployment of mode single"
+set -g TESTDESC "Deployment of mode single (development)"
 set -g YAMLFILE generated/single-community-dev.yaml
 set -g DEPLOYMENT acceptance-single
 printheader
@@ -12,12 +12,12 @@ printheader
 kubectl apply -f $YAMLFILE
 and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
 and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 60
+testArangoDB $ip 120
 or fail "ArangoDB was not reachable."
 
 # Manual check
diff --git a/tests/acceptance/semiautomation/test1b.fish b/tests/acceptance/semiautomation/test1b.fish
@@ -3,8 +3,8 @@
 source helper.fish
 
 set -g TESTNAME test1b
-set -g TESTDESC "Deployment of mode active/failover"
-set -g YAMLFILE generated/activefailover-community-pro.yaml
+set -g TESTDESC "Deployment of mode active/failover (development)"
+set -g YAMLFILE generated/activefailover-community-dev.yaml
 set -g DEPLOYMENT acceptance-activefailover
 printheader
 
@@ -14,12 +14,12 @@ and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
 and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
 and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
 and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 60
+testArangoDB $ip 120
 or fail "ArangoDB was not reachable."
 
 # Manual check
diff --git a/tests/acceptance/semiautomation/test1c.fish b/tests/acceptance/semiautomation/test1c.fish
@@ -3,7 +3,7 @@
 source helper.fish
 
 set -g TESTNAME test1c
-set -g TESTDESC "Deployment of mode cluster (enterprise)"
+set -g TESTDESC "Deployment of mode cluster (development, enterprise)"
 set -g YAMLFILE generated/cluster-enterprise-dev.yaml
 set -g DEPLOYMENT acceptance-cluster
 printheader
@@ -14,12 +14,12 @@ and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
 and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
 and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
 and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 60
+testArangoDB $ip 120
 or fail "ArangoDB was not reachable."
 
 # Manual check
diff --git a/tests/acceptance/semiautomation/test1d.fish b/tests/acceptance/semiautomation/test1d.fish
@@ -3,7 +3,7 @@
 source helper.fish
 
 set -g TESTNAME test1d
-set -g TESTDESC "Deployment of mode cluster with sync (enterprise)"
+set -g TESTDESC "Deployment of mode cluster with sync (development, enterprise)"
 set -g YAMLFILE generated/cluster-sync-enterprise-dev.yaml
 set -g DEPLOYMENT acceptance-cluster
 printheader
@@ -17,13 +17,13 @@ and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
 and waitForKubectl "get pod" "$DEPLOYMENT-syma" "1/1 *Running" 3 120
 and waitForKubectl "get pod" "$DEPLOYMENT-sywo" "1/1 *Running" 3 120
 and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-sync *LoadBalancer" "-v;pending" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+and waitForKubectl "get service" "$DEPLOYMENT-sync *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 60
+testArangoDB $ip 120
 or fail "ArangoDB was not reachable."
 
 # Manual check
diff --git a/tests/acceptance/semiautomation/test2a.fish b/tests/acceptance/semiautomation/test2a.fish
@@ -14,12 +14,12 @@ and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
 and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
 and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
 and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 60
+testArangoDB $ip 120
 or fail "ArangoDB was not reachable."
 
 # Scale up the deployment
diff --git a/tests/acceptance/semiautomation/test2b.fish b/tests/acceptance/semiautomation/test2b.fish
@@ -3,7 +3,7 @@
 source helper.fish
 
 set -g TESTNAME test2b
-set -g TESTDESC "Scale an cluster deployment (enterprise)"
+set -g TESTDESC "Scale a cluster deployment (development, enterprise)"
 set -g YAMLFILE generated/cluster-enterprise-dev.yaml
 set -g DEPLOYMENT acceptance-cluster
 printheader
@@ -15,16 +15,16 @@ and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
 and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
 and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
 and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
-and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
 or fail "Deployment did not get ready."
 
 # Automatic check
 set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
-testArangoDB $ip 60
+testArangoDB $ip 120
 or fail "ArangoDB was not reachable."
 
 # Patching
-output "Patching" "Patching Spec for Scaling up"
+output "Scaling db servers up" "Patching Spec for Scaling up DBservers"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/dbservers/count", "value":5}]'
 and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 11 120
 and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 5 120
@@ -33,7 +33,7 @@ and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
 or fail "Deployment did not get ready."
 
 # Patching
-output "Patching" "Patching Spec for Scaling up"
+output "Scaling coordinators up" "Patching Spec for Scaling up coordinators"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/coordinators/count", "value":4}]'
 and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 12 120
 and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 5 120
@@ -42,7 +42,7 @@ and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 4 120
 or fail "Deployment did not get ready."
 
 # Patching
-output "Patching" "Patching Spec for Scaling up"
+output "Scaling dbservers down" "Patching Spec for Scaling down dbservers"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/dbservers/count", "value":2}]'
 and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 9 120
 and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 120
@@ -51,7 +51,7 @@ and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 4 120
 or fail "Deployment did not get ready."
 
 # Patching
-output "Patching" "Patching Spec for Scaling up"
+output "Scaling coordinators down" "Patching Spec for Scaling down coordinators"
 kubectl patch arango $DEPLOYMENT --type='json' -p='[{"op": "replace", "path": "/spec/coordinators/count", "value":1}]'
 and waitForKubectl "get pod" "$DEPLOYMENT" "1/1 *Running" 6 120
 and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 2 120
diff --git a/tests/acceptance/semiautomation/test3a.fish b/tests/acceptance/semiautomation/test3a.fish
@@ -0,0 +1,32 @@
+#!/usr/bin/fish
+
+source helper.fish
+
+set -g TESTNAME test3a
+set -g TESTDESC "Deployment of mode single (production)"
+set -g YAMLFILE generated/single-enterprise-pro.yaml
+set -g DEPLOYMENT acceptance-single
+printheader
+
+# Deploy and check
+kubectl apply -f $YAMLFILE
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl" "1/1 *Running" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+or fail "Deployment did not get ready."
+
+# Automatic check
+set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
+testArangoDB $ip 120
+or fail "ArangoDB was not reachable."
+
+# Manual check
+output "Work" "Now please check external access on this URL with your browser:" "  https://$ip:8529/" "then type the outcome followed by ENTER."
+inputAndLogResult
+
+# Cleanup
+kubectl delete -f $YAMLFILE
+waitForKubectl "get pod" $DEPLOYMENT-sngl "" 0 120
+or fail "Could not delete deployment."
+
+output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3b.fish b/tests/acceptance/semiautomation/test3b.fish
@@ -0,0 +1,34 @@
+#!/usr/bin/fish
+
+source helper.fish
+
+set -g TESTNAME test3b
+set -g TESTDESC "Deployment of mode active/failover (production)"
+set -g YAMLFILE generated/activefailover-community-pro.yaml
+set -g DEPLOYMENT acceptance-activefailover
+printheader
+
+# Deploy and check
+kubectl apply -f $YAMLFILE
+and waitForKubectl "get pod" $DEPLOYMENT "1 *Running" 5 120
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*1/1 *Running" "" 1 120
+and waitForKubectl "get pod" "$DEPLOYMENT-sngl.*0/1 *Running" "" 1 120
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+or fail "Deployment did not get ready."
+
+# Automatic check
+set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
+testArangoDB $ip 120
+or fail "ArangoDB was not reachable."
+
+# Manual check
+output "Work" "Now please check external access on this URL with your browser:" "  https://$ip:8529/" "then type the outcome followed by ENTER."
+inputAndLogResult
+
+# Cleanup
+kubectl delete -f $YAMLFILE
+waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+or fail "Could not delete deployment."
+
+output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3c.fish b/tests/acceptance/semiautomation/test3c.fish
@@ -0,0 +1,34 @@
+#!/usr/bin/fish
+
+source helper.fish
+
+set -g TESTNAME test3c
+set -g TESTDESC "Deployment of mode cluster (production, enterprise)"
+set -g YAMLFILE generated/cluster-enterprise-pro.yaml
+set -g DEPLOYMENT acceptance-cluster
+printheader
+
+# Deploy and check
+kubectl apply -f $YAMLFILE
+and waitForKubectl "get pod" "$DEPLOYMENT-prmr" "1/1 *Running" 3 120
+and waitForKubectl "get pod" "$DEPLOYMENT-agnt" "1/1 *Running" 3 120
+and waitForKubectl "get pod" "$DEPLOYMENT-crdn" "1/1 *Running" 3 120
+and waitForKubectl "get service" "$DEPLOYMENT *ClusterIP" 8529 1 120
+and waitForKubectl "get service" "$DEPLOYMENT-ea *LoadBalancer" "-v;pending" 1 180
+or fail "Deployment did not get ready."
+
+# Automatic check
+set ip (getLoadBalancerIP "$DEPLOYMENT-ea")
+testArangoDB $ip 120
+or fail "ArangoDB was not reachable."
+
+# Manual check
+output "Work" "Now please check external access on this URL with your browser:" "  https://$ip:8529/" "then type the outcome followed by ENTER."
+inputAndLogResult
+
+# Cleanup
+kubectl delete -f $YAMLFILE
+waitForKubectl "get pod" $DEPLOYMENT "" 0 120
+or fail "Could not delete deployment."
+
+output "Ready" ""
diff --git a/tests/acceptance/semiautomation/test3d.fish b/tests/acceptance/semiautomation/test3d.fish
diff --git a/tests/acceptance/semiautomation/test4a.fish b/tests/acceptance/semiautomation/test4a.fish
diff --git a/tests/acceptance/semiautomation/test4b.fish b/tests/acceptance/semiautomation/test4b.fish
