Update e2e intervals

Add new intervals from upstream capi
Remove unused intervals
Extend machine-upgrade to 120m instead of 60m

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

test/e2e/config/packet-ci-actions.yaml

@@ -167,18 +167,14 @@ variables:
   INIT_WITH_KUBERNETES_VERSION: "v1.21.14"
 
 intervals:
+  default/wait-controllers: ["5m", "10s"]
   default/wait-cluster: ["20m", "10s"]
   default/wait-control-plane: ["30m", "10s"]
   default/wait-worker-nodes: ["30m", "10s"]
-  default/wait-controllers: ["5m", "10s"]
   default/wait-delete-cluster: ["20m", "10s"]
-  default/wait-machine-upgrade: ["60m", "10s"]
-  default/wait-machine-status: ["20m", "10s"]
-  default/wait-failed-machine-status: ["2m", "10s"]
-  default/wait-machine-remediation: ["30m", "10s"]
-  default/wait-deployment: ["15m", "10s"]
-  default/wait-deployment-available: ["15m", "10s"]
-  default/wait-job: ["5m", "10s"]
+  default/wait-machine-upgrade: ["120m", "10s"]
   default/wait-nodes-ready: ["10m", "10s"]
-  default/wait-service: ["15m", "10s"]
+  default/wait-machine-remediation: ["30m", "10s"]
+  node-drain/wait-deployment-available: ["15m", "10s"]
+  node-drain/wait-control-plane: ["30m", "10s"]
   node-drain/wait-machine-deleted: ["10m", "10s"]

test/e2e/config/packet-ci.yaml

@@ -172,18 +172,14 @@ variables:
   INIT_WITH_KUBERNETES_VERSION: "v1.21.14"
 
 intervals:
+  default/wait-controllers: ["5m", "10s"]
   default/wait-cluster: ["20m", "10s"]
   default/wait-control-plane: ["30m", "10s"]
   default/wait-worker-nodes: ["30m", "10s"]
-  default/wait-controllers: ["5m", "10s"]
   default/wait-delete-cluster: ["20m", "10s"]
-  default/wait-machine-upgrade: ["60m", "10s"]
-  default/wait-machine-status: ["20m", "10s"]
-  default/wait-failed-machine-status: ["2m", "10s"]
-  default/wait-machine-remediation: ["30m", "10s"]
-  default/wait-deployment: ["15m", "10s"]
-  default/wait-deployment-available: ["15m", "10s"]
-  default/wait-job: ["5m", "10s"]
+  default/wait-machine-upgrade: ["120m", "10s"]
   default/wait-nodes-ready: ["10m", "10s"]
-  default/wait-service: ["15m", "10s"]
-  node-drain/wait-machine-deleted: ["10m", "10s"]
+  default/wait-machine-remediation: ["30m", "10s"]
+  node-drain/wait-deployment-available: ["15m", "10s"]
+  node-drain/wait-control-plane: ["30m", "10s"]
+  node-drain/wait-machine-deleted: ["10m", "10s"]