Merge pull request #214 from batistein/main

🌱 Fixing caph upgrade e2e test
syself · Jun 4, 2022 · 53a501b · 53a501b
2 parents a8ac650 + 626c802
commit 53a501b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/test/e2e/config/hetzner-ci.yaml b/test/e2e/config/hetzner-ci.yaml
@@ -63,8 +63,8 @@ providers:
   - name: hetzner
     type: InfrastructureProvider
     versions:
-      - name: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} # latest published release
-        value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}/infrastructure-components.yaml
+      - name: ${CAPH_LATEST_VERSION:-} # latest published release
+        value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-}/infrastructure-components.yaml
         type: "url"
         contract: v1beta1
         files:
@@ -115,10 +115,10 @@ variables:
 
   # NOTE: INIT_WITH_BINARY and INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize
   # the management cluster to be upgraded.
-  INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/clusterctl-linux-amd64"
+  INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-linux-amd64"
   INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
   INIT_WITH_KUBERNETES_VERSION: "v1.24.1"
-  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}
+  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
 
   # Cluster Addons
   CNI: "./data/cni/cilium/cilium.yaml"
@@ -146,9 +146,9 @@ variables:
   REDACT_LOG_SCRIPT: "../../hack/log/redact.sh"
 
 intervals:
-  default/wait-cluster: ["15m", "10s"]
+  default/wait-cluster: ["20m", "10s"]
   default/wait-control-plane: ["30m", "10s"]
-  default/wait-worker-nodes: ["20m", "10s"]
+  default/wait-worker-nodes: ["15m", "10s"]
   default/wait-controllers: ["5m", "10s"]
   default/wait-delete-cluster: ["20m", "10s"]
   default/wait-machine-upgrade: ["20m", "10s"]

diff --git a/test/e2e/config/hetzner-talos.yaml b/test/e2e/config/hetzner-talos.yaml
@@ -95,7 +95,7 @@ variables:
   INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-linux-amd64"
   INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
   INIT_WITH_KUBERNETES_VERSION: "v1.23.6"
-  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}
+  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
 
   # Cluster Addons
   CNI: "./data/cni/cilium/cilium.yaml"

diff --git a/test/e2e/config/hetzner.yaml b/test/e2e/config/hetzner.yaml
@@ -63,8 +63,8 @@ providers:
   - name: hetzner
     type: InfrastructureProvider
     versions:
-      - name: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18} # latest published release
-        value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}/infrastructure-components.yaml
+      - name: ${CAPH_LATEST_VERSION:-} # latest published release
+        value: https://github.com/syself/cluster-api-provider-hetzner/releases/download/${CAPH_LATEST_VERSION:-}/infrastructure-components.yaml
         type: "url"
         contract: v1beta1
         files:
@@ -124,7 +124,7 @@ variables:
   INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/clusterctl-linux-amd64"
   INIT_WITH_PROVIDERS_CONTRACT: "v1beta1"
   INIT_WITH_KUBERNETES_VERSION: "v1.24.1"
-  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-v1.0.0-alpha.18}
+  INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
 
   # Cluster Addons
   CNI: "./data/cni/cilium/cilium.yaml"
@@ -152,9 +152,9 @@ variables:
   REDACT_LOG_SCRIPT: "../../hack/log/redact.sh"
 
 intervals:
-  default/wait-cluster: ["15m", "10s"]
+  default/wait-cluster: ["20m", "10s"]
   default/wait-control-plane: ["30m", "10s"]
-  default/wait-worker-nodes: ["20m", "10s"]
+  default/wait-worker-nodes: ["15m", "10s"]
   default/wait-controllers: ["5m", "10s"]
   default/wait-delete-cluster: ["20m", "10s"]
   default/wait-machine-upgrade: ["20m", "10s"]