Adjust tests to new structure

test/acre.yaml

@@ -4,49 +4,39 @@ credentials:
 
 ############################################################################
 
+
 landscape:
   name: test-gardener-oq
 
   versions:
     gardener:
-      tag: (( env( "GARDENER_VERSION" ) || "1.18.1" ))
-    dashboard:
-      branch: master
+      apiserver:
+        image_tag: (( env( "GARDENER_VERSION" ) || "0.20.2" ))
+      controller_manager:
+        image_tag: (( env( "GARDENER_VERSION" ) || "0.20.2" ))
+      tag: (( env( "GARDENER_VERSION" ) || "0.20.2" ))
 
-  cluster:
-    kubeconfig: ./kubeconfig
-    domain: setup.oq.gcp.dev.k8s.ondemand.com
-    iaas: gcp
-    region: europe-west1
+  domain: setup.oq.gcp.dev.k8s.ondemand.com
 
-  networks:
-    nodes: 10.254.0.0/19
-    pods: 10.255.0.0/17
-    services: 10.255.128.0/17
+  cluster:
+    networks:
+      nodes: 10.254.0.0/19
+      pods: 10.255.0.0/17
+      services: 10.255.128.0/17
 
   iaas:
-    region: (( cluster.region ))
+    type: gcp
+    region: europe-west1
     zones:
-      - (( cluster.region "-b"))
-      - (( cluster.region "-c"))
-      - (( cluster.region "-d"))
-    credentials:
-      <<: (( .credentials ))
-
-  etcd:
-    backup:
-      type: gcs
-      region: europe-west1
-      credentials:
-        <<: (( .credentials ))
-
-  dns:
-    type: google-clouddns
+      - (( iaas.region "-b"))
+      - (( iaas.region "-c"))
+      - (( iaas.region "-d"))
     credentials:
       <<: (( .credentials ))
 
   identity:
     users:
       - email: "[email protected]"
         username: "example"
-        password: (( rand("A-Z", 10) ))
+        password: (( rand("A-Z", 10) ))
+

test/scripts/create

@@ -1,5 +1,12 @@
 #! /bin/bash -e
 
+copy_state() {
+    mkdir -p $TM_SHARED_PATH/setup
+    cp -R ./state $TM_SHARED_PATH/setup
+    cp -R ./export $TM_SHARED_PATH/setup
+    cp -R ./gen $TM_SHARED_PATH/setup
+}
+
 SOURCE_PATH="$(realpath .)"
 
 # change working directory and add garden-setup as crop
@@ -8,13 +15,12 @@ cd /tmp/garden
 ln -s $SOURCE_PATH ./crop
 cp $SOURCE_PATH/test/acre.yaml .
 
+trap copy_state EXIT
+
 sow order -A
-sow deploy -A
+sow -Dv deploy -A
 
 cp -R ./export/kube-apiserver/kubeconfig $TM_KUBECONFIG_PATH/gardener.config
 
-mkdir -p $TM_KUBECONFIG_PATH/setup
-cp -R ./state $TM_KUBECONFIG_PATH/setup
-cp -R ./export $TM_KUBECONFIG_PATH/setup
-cp -R ./gen $TM_KUBECONFIG_PATH/setup
+copy_state
 

test/scripts/delete

@@ -1,5 +1,6 @@
 #! /bin/bash -e
 
+
 SOURCE_PATH="$(realpath .)"
 
 # change working directory and add garden-setup as crop
@@ -8,7 +9,7 @@ cd /tmp/garden
 ln -s $SOURCE_PATH ./crop
 cp $SOURCE_PATH/test/acre.yaml .
 
-cp -R $TM_KUBECONFIG_PATH/setup/* .
+cp -R $TM_SHARED_PATH/setup/* .
 
 sow order -A
 sow delete -A

test/scripts/upgrade

@@ -1,5 +1,12 @@
 #! /bin/bash -e
 
+copy_state() {
+    mkdir -p $TM_SHARED_PATH/setup
+    cp -R ./state $TM_SHARED_PATH/setup
+    cp -R ./export $TM_SHARED_PATH/setup
+    cp -R ./gen $TM_SHARED_PATH/setup
+}
+
 SOURCE_PATH="$(realpath .)"
 
 # change working directory and add garden-setup as crop
@@ -8,13 +15,11 @@ cd /tmp/garden
 ln -s $SOURCE_PATH ./crop
 cp $SOURCE_PATH/test/acre.yaml .
 
-mv -v $TM_KUBECONFIG_PATH/setup/* .
+mv -v $TM_SHARED_PATH/setup/* .
 
+trap copy_state EXIT
 sow order -A
 sow deploy -A
 
-mkdir -p $TM_KUBECONFIG_PATH/setup
-cp -R ./state $TM_KUBECONFIG_PATH/setup
-cp -R ./export $TM_KUBECONFIG_PATH/setup
-cp -R ./gen $TM_KUBECONFIG_PATH/setup
+copy_state
 

test/testrun.yaml

@@ -16,7 +16,7 @@ spec:
       config:
       - name: GARDENER_VERSION
         type: env
-        value: 0.18.1
+        value: 0.20.1
       - name: host-kubeconfig
         type: file
         path: "/tmp/garden/kubeconfig"
@@ -36,7 +36,7 @@ spec:
       config:
       - name: GARDENER_VERSION
         type: env
-        value: 0.19.1
+        value: 0.20.2
       - name: host-kubeconfig
         type: file
         path: "/tmp/garden/kubeconfig"