From ca25e6a6ce21554defdefbc9bf16798c71c72c60 Mon Sep 17 00:00:00 2001 From: shuangkun Date: Fri, 29 Mar 2024 22:36:31 +0800 Subject: [PATCH] fix: comments Signed-off-by: shuangkun --- test/e2e/argo_server_test.go | 3 +- .../retry-workflow-with-continueon.yaml | 44 ++++++++----------- workflow/util/util_test.go | 36 +-------------- 3 files changed, 23 insertions(+), 60 deletions(-) diff --git a/test/e2e/argo_server_test.go b/test/e2e/argo_server_test.go index 0d5a93a122bb..042f273f3907 100644 --- a/test/e2e/argo_server_test.go +++ b/test/e2e/argo_server_test.go @@ -1582,6 +1582,7 @@ func (s *ArgoServerSuite) TestRetryWorkflowWithContinueOn() { Then(). ExpectWorkflow(func(t *testing.T, metadata *metav1.ObjectMeta, status *wfv1.WorkflowStatus) { workflowName = metadata.Name + assert.Equal(t, 6, len(status.Nodes)) }) s.Run("Retry", func() { @@ -1603,7 +1604,7 @@ func (s *ArgoServerSuite) TestRetryWorkflowWithContinueOn() { assert.Equal(t, 6, len(status.Nodes)) }). ExpectWorkflowNode(func(status wfv1.NodeStatus) bool { - return strings.Contains(status.Name, "dag-to-retry.success") + return strings.Contains(status.Name, "retry-workflow-with-continueon.success") }, func(t *testing.T, status *wfv1.NodeStatus, pod *corev1.Pod) { assert.Equal(t, 2, len(status.Children)) }) diff --git a/test/e2e/testdata/retry-workflow-with-continueon.yaml b/test/e2e/testdata/retry-workflow-with-continueon.yaml index 23656225022f..9d2ce1414860 100644 --- a/test/e2e/testdata/retry-workflow-with-continueon.yaml +++ b/test/e2e/testdata/retry-workflow-with-continueon.yaml @@ -1,61 +1,55 @@ apiVersion: argoproj.io/v1alpha1 kind: WorkflowTemplate metadata: - name: "dag-to-retry" + name: retry-workflow-with-continueon spec: - podMetadata: - annotations: - sidecar.istio.io/inject: "false" entrypoint: dag templates: - - name: step - inputs: - parameters: - - name: exitCode - container: - image: alpine:3.7 - command: [ sh, "-c", "exit {{inputs.parameters.exitCode}}" ] - name: dag dag: failFast: false tasks: - name: success - template: step + template: node-to-exit arguments: parameters: - name: exitCode value: 0 - name: failure - template: step - dependencies: - - success + template: node-to-exit + dependencies: [success] arguments: parameters: - name: exitCode value: 1 - name: task-after-failure - template: step - dependencies: - - failure + template: node-to-exit + dependencies: [failure] arguments: parameters: - name: exitCode value: 0 - name: continue - template: step + template: node-to-exit continueOn: failed: true - dependencies: - - success + dependencies: [success] arguments: parameters: - name: exitCode value: 2 - name: task-after-continue - template: step - dependencies: - - continue + template: node-to-exit + dependencies: [continue] arguments: parameters: - name: exitCode - value: 0 \ No newline at end of file + value: 0 + + - name: node-to-exit + inputs: + parameters: + - name: exitCode + container: + image: alpine:3.7 + command: [ sh, "-c", "exit {{inputs.parameters.exitCode}}" ] \ No newline at end of file diff --git a/workflow/util/util_test.go b/workflow/util/util_test.go index f9e43356e5e3..52a03693d01b 100644 --- a/workflow/util/util_test.go +++ b/workflow/util/util_test.go @@ -2129,21 +2129,8 @@ status: artifactGCStatus: notSpecified: true artifactRepositoryRef: - artifactRepository: - archiveLogs: true - s3: - accessKeySecret: - key: accesskey - name: my-minio-cred - bucket: my-bucket - endpoint: minio:9000 - insecure: true - secretKeySecret: - key: secretkey - name: my-minio-cred - configMap: artifact-repositories - key: default-v1 - namespace: argo + artifactRepository: {} + default: true conditions: - status: "False" type: PodRunning @@ -2185,10 +2172,6 @@ status: message: Error (exit code 1) name: dag-to-retry-tb7r7.failure outputs: - artifacts: - - name: main-logs - s3: - key: dag-to-retry-tb7r7/dag-to-retry-tb7r7-step-1325528633/main.log exitCode: "1" phase: Failed progress: 0/1 @@ -2214,10 +2197,6 @@ status: message: Error (exit code 2) name: dag-to-retry-tb7r7.continue outputs: - artifacts: - - name: main-logs - s3: - key: dag-to-retry-tb7r7/dag-to-retry-tb7r7-step-1670055836/main.log exitCode: "2" phase: Failed progress: 0/1 @@ -2243,10 +2222,6 @@ status: value: "0" name: dag-to-retry-tb7r7.success outputs: - artifacts: - - name: main-logs - s3: - key: dag-to-retry-tb7r7/dag-to-retry-tb7r7-step-1819567448/main.log exitCode: "0" phase: Succeeded progress: 1/1 @@ -2269,10 +2244,6 @@ status: value: "0" name: dag-to-retry-tb7r7.task-after-continue outputs: - artifacts: - - name: main-logs - s3: - key: dag-to-retry-tb7r7/dag-to-retry-tb7r7-step-1987291523/main.log exitCode: "0" phase: Succeeded progress: 1/1 @@ -2370,9 +2341,6 @@ status: activeDeadlineSeconds: 300 arguments: {} entrypoint: dag - podMetadata: - annotations: - sidecar.istio.io/inject: "false" podSpecPatch: | terminationGracePeriodSeconds: 3 templates: