diff --git a/chart/infra-server/static/janitor-delete-gke-default.yaml b/chart/infra-server/static/janitor-delete-gke-default.yaml index 394a60d3a..79cde2e6e 100644 --- a/chart/infra-server/static/janitor-delete-gke-default.yaml +++ b/chart/infra-server/static/janitor-delete-gke-default.yaml @@ -22,7 +22,7 @@ spec: template: destroy - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-gke-default-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/janitor-delete-openshift-4.yaml b/chart/infra-server/static/janitor-delete-openshift-4.yaml index c0cc3370d..8433bf23e 100644 --- a/chart/infra-server/static/janitor-delete-openshift-4.yaml +++ b/chart/infra-server/static/janitor-delete-openshift-4.yaml @@ -28,6 +28,7 @@ spec: - name: destroy + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/janitor-delete-openshift-rosa.yaml b/chart/infra-server/static/janitor-delete-openshift-rosa.yaml index 84de4c6d2..5f081146e 100644 --- a/chart/infra-server/static/janitor-delete-openshift-rosa.yaml +++ b/chart/infra-server/static/janitor-delete-openshift-rosa.yaml @@ -25,7 +25,7 @@ spec: template: destroy - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-aks.yaml b/chart/infra-server/static/workflow-aks.yaml index e84315977..0b2d58f3c 100644 --- a/chart/infra-server/static/workflow-aks.yaml +++ b/chart/infra-server/static/workflow-aks.yaml @@ -34,6 +34,8 @@ spec: template: destroy - name: create + activeDeadlineSeconds: 7200 + timeout: 2h outputs: artifacts: - name: kubeconfig @@ -103,6 +105,7 @@ spec: suspend: {} - name: destroy + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-aks-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-demo.yaml b/chart/infra-server/static/workflow-demo.yaml index 9b098e5e3..00a230c6e 100644 --- a/chart/infra-server/static/workflow-demo.yaml +++ b/chart/infra-server/static/workflow-demo.yaml @@ -49,8 +49,10 @@ spec: artifacts: - name: tfstate from: '{{ "{{" }}workflow.outputs.artifacts.global-tfstate{{ "}}" }}' + optional: true - name: tfvars from: '{{ "{{" }}workflow.outputs.artifacts.global-tfvars{{ "}}" }}' + optional: true - name: roxctl activeDeadlineSeconds: 600 @@ -70,7 +72,8 @@ spec: - /tmp/roxctl - name: create - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 + timeout: 2h inputs: artifacts: - name: roxctl @@ -176,7 +179,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 inputs: artifacts: - name: tfstate diff --git a/chart/infra-server/static/workflow-eks.yaml b/chart/infra-server/static/workflow-eks.yaml index 805b00d39..8a05de260 100644 --- a/chart/infra-server/static/workflow-eks.yaml +++ b/chart/infra-server/static/workflow-eks.yaml @@ -34,7 +34,8 @@ spec: template: destroy - name: create - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 + timeout: 2h outputs: artifacts: - name: kubeconfig @@ -88,7 +89,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-eks-{{ .Chart.Annotations.automationFlavorsVersion }} command: diff --git a/chart/infra-server/static/workflow-gke-default.yaml b/chart/infra-server/static/workflow-gke-default.yaml index 4be3a1203..51dbeb9a2 100644 --- a/chart/infra-server/static/workflow-gke-default.yaml +++ b/chart/infra-server/static/workflow-gke-default.yaml @@ -44,7 +44,8 @@ spec: value: '{{ "{{" }}workflow.parameters.name{{ "}}" }}' - name: create - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 + timeout: 2h outputs: artifacts: - name: kubeconfig @@ -90,7 +91,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-gke-default-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-openshift-4-demo.yaml b/chart/infra-server/static/workflow-openshift-4-demo.yaml index 1a658809a..893be2e31 100644 --- a/chart/infra-server/static/workflow-openshift-4-demo.yaml +++ b/chart/infra-server/static/workflow-openshift-4-demo.yaml @@ -79,6 +79,8 @@ spec: template: destroy - name: create + activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -272,6 +274,7 @@ spec: suspend: {} - name: destroy + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml index 74866f881..eea8d2860 100644 --- a/chart/infra-server/static/workflow-openshift-4.yaml +++ b/chart/infra-server/static/workflow-openshift-4.yaml @@ -70,6 +70,8 @@ spec: template: destroy - name: create + activeDeadlineSeconds: 7200 + timeout: 2h outputs: artifacts: - name: kubeconfig @@ -208,6 +210,7 @@ spec: suspend: {} - name: destroy + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-openshift-4-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-openshift-aro.yaml b/chart/infra-server/static/workflow-openshift-aro.yaml index cab8217f9..fe661b14c 100644 --- a/chart/infra-server/static/workflow-openshift-aro.yaml +++ b/chart/infra-server/static/workflow-openshift-aro.yaml @@ -40,6 +40,7 @@ spec: - name: create activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-aro-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -130,7 +131,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-aro-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-openshift-ibmroks.yaml b/chart/infra-server/static/workflow-openshift-ibmroks.yaml index 4b62b1a51..81ac5247a 100644 --- a/chart/infra-server/static/workflow-openshift-ibmroks.yaml +++ b/chart/infra-server/static/workflow-openshift-ibmroks.yaml @@ -47,6 +47,7 @@ spec: - name: create activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -113,7 +114,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-ibmroks-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml index fdfbfde0b..1c123854e 100644 --- a/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa-hcp.yaml @@ -48,6 +48,7 @@ spec: - name: create activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -145,7 +146,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-openshift-rosa.yaml b/chart/infra-server/static/workflow-openshift-rosa.yaml index 8ca639b4c..56780f59c 100644 --- a/chart/infra-server/static/workflow-openshift-rosa.yaml +++ b/chart/infra-server/static/workflow-openshift-rosa.yaml @@ -42,6 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -127,7 +128,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-rosa-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-osd-aws.yaml b/chart/infra-server/static/workflow-osd-aws.yaml index b12bd94ff..bdaa3fb8c 100644 --- a/chart/infra-server/static/workflow-osd-aws.yaml +++ b/chart/infra-server/static/workflow-osd-aws.yaml @@ -42,6 +42,7 @@ spec: - name: create activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -128,7 +129,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-osd-gcp.yaml b/chart/infra-server/static/workflow-osd-gcp.yaml index 66ffa951c..1a1972c9f 100644 --- a/chart/infra-server/static/workflow-osd-gcp.yaml +++ b/chart/infra-server/static/workflow-osd-gcp.yaml @@ -43,6 +43,7 @@ spec: - name: create activeDeadlineSeconds: 7200 + timeout: 2h container: image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always @@ -128,7 +129,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 container: image: quay.io/stackrox-io/ci:automation-flavors-osd-{{ .Chart.Annotations.automationFlavorsVersion }} imagePullPolicy: Always diff --git a/chart/infra-server/static/workflow-qa-demo.yaml b/chart/infra-server/static/workflow-qa-demo.yaml index 4a5681bb8..9961a0e2f 100644 --- a/chart/infra-server/static/workflow-qa-demo.yaml +++ b/chart/infra-server/static/workflow-qa-demo.yaml @@ -57,8 +57,10 @@ spec: artifacts: - name: tfstate from: '{{ "{{" }}workflow.outputs.artifacts.global-tfstate{{ "}}" }}' + optional: true - name: tfvars from: '{{ "{{" }}workflow.outputs.artifacts.global-tfvars{{ "}}" }}' + optional: true - name: roxctl activeDeadlineSeconds: 600 @@ -78,7 +80,8 @@ spec: - /tmp/roxctl - name: create - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 + timeout: 2h inputs: artifacts: - name: roxctl @@ -183,7 +186,7 @@ spec: suspend: {} - name: destroy - activeDeadlineSeconds: 3600 + activeDeadlineSeconds: 7200 inputs: artifacts: - name: tfstate