fix: Flakey TestNestedClusterWorkflowTemplate testcase failure (argop…

…roj#2613)
highb · Apr 15, 2020 · db6d141 · db6d141
1 parent b4fd447
commit db6d141
Show file tree

Hide file tree

Showing 11 changed files with 85 additions and 40 deletions.
diff --git a/test/e2e/cluster_workflow_template_test.go b/test/e2e/cluster_workflow_template_test.go
@@ -33,30 +33,36 @@ func (s *ClusterWorkflowTemplateSuite) TestSubmitClusterWorkflowTemplate() {
 }
 
 func (s *ClusterWorkflowTemplateSuite) TestNestedClusterWorkflowTemplate() {
- // https://github.com/argoproj/argo/issues/2622
- s.T().SkipNow()
- s.Given().WorkflowTemplate("@smoke/cluster-workflow-template-whalesay-template.yaml").
- WorkflowTemplate("@testdata/cluster-workflow-template-nested-template.yaml").
- Workflow(`apiVersion: argoproj.io/v1alpha1
+ s.Given().
+ ClusterWorkflowTemplate("@testdata/cluster-workflow-template-nested-template.yaml").
+ When().Given().
+ ClusterWorkflowTemplate("@smoke/cluster-workflow-template-whalesay-template.yaml").
+ When().CreateClusterWorkflowTemplates().
+ Given().
+ WorkflowName("cwft-wf").
+ Workflow(`
+apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
- generateName: workflow-template-nested-
+ name: cwft-wf
+ namespace: argo
  labels:
  argo-e2e: true
 spec:
  entrypoint: whalesay
  templates:
  - name: whalesay
- inputs:
- parameters:
- - name: message
- value: hello from nested
- templateRef:
- name: cluster-workflow-template-nested-template
- template: whalesay-template
- clusterscope: true
+ steps:
+ - - name: call-whalesay-template
+ templateRef:
+ name: cluster-workflow-template-nested-template 
+ template: whalesay-template
+ clusterscope: true
+ arguments:
+ parameters:
+ - name: message
+ value: hello from nested
 `).When().
- CreateClusterWorkflowTemplates().
  SubmitWorkflow().
  WaitForWorkflow(30 * time.Second).
  Then().

diff --git a/test/e2e/fixtures/when.go b/test/e2e/fixtures/when.go
@@ -238,6 +238,7 @@ func (w *When) Given() *Given {
  offloadNodeStatusRepo: w.offloadNodeStatusRepo,
  wf: w.wf,
  wfTemplates: w.wfTemplates,
+ cwfTemplates: w.cwfTemplates,
  cronWf: w.cronWf,
  workflowName: w.workflowName,
  kubeClient: w.kubeClient,

diff --git a/test/e2e/manifests/mixins/cluster-workflow-template-rbac.yaml b/test/e2e/manifests/mixins/cluster-workflow-template-rbac.yaml
@@ -0,0 +1,33 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+ name: argo-server-clusterworkflowtemplate-role
+rules:
+ - apiGroups:
+ - argoproj.io
+ resources:
+ - clusterworkflowtemplates
+ - clusterworkflowtemplates/finalizers
+ verbs:
+ - get
+ - list
+ - watch
+ - create
+ - delete
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+ name: argo-clusterworkflowtemplate-role
+rules:
+ - apiGroups:
+ - argoproj.io
+ resources:
+ - clusterworkflowtemplates
+ - clusterworkflowtemplates/finalizers
+ verbs:
+ - get
+ - list
+ - watch
+ - create
+ - delete
diff --git a/test/e2e/manifests/mysql.yaml b/test/e2e/manifests/mysql.yaml
@@ -258,6 +258,8 @@ rules:
  - get
  - list
  - watch
+ - create
+ - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -273,6 +275,8 @@ rules:
  - get
  - list
  - watch
+ - create
+ - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/test/e2e/manifests/mysql/kustomization.yaml b/test/e2e/manifests/mysql/kustomization.yaml
@@ -7,3 +7,4 @@ patchesStrategicMerge:
  - ../mixins/argo-server-deployment.yaml
  - ../mixins/workflow-controller-configmap.yaml
  - ../mixins/workflow-controller-deployment.yaml
+ - ../mixins/cluster-workflow-template-rbac.yaml
diff --git a/test/e2e/manifests/no-db.yaml b/test/e2e/manifests/no-db.yaml
@@ -258,6 +258,8 @@ rules:
  - get
  - list
  - watch
+ - create
+ - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -273,6 +275,8 @@ rules:
  - get
  - list
  - watch
+ - create
+ - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/test/e2e/manifests/no-db/kustomization.yaml b/test/e2e/manifests/no-db/kustomization.yaml
@@ -6,3 +6,4 @@ patchesStrategicMerge:
  - ../mixins/argo-server-deployment.yaml
  - ../mixins/workflow-controller-configmap.yaml
  - ../mixins/workflow-controller-deployment.yaml
+ - ../mixins/cluster-workflow-template-rbac.yaml
diff --git a/test/e2e/manifests/postgres.yaml b/test/e2e/manifests/postgres.yaml
@@ -258,6 +258,8 @@ rules:
  - get
  - list
  - watch
+ - create
+ - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -273,6 +275,8 @@ rules:
  - get
  - list
  - watch
+ - create
+ - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding

diff --git a/test/e2e/manifests/postgres/kustomization.yaml b/test/e2e/manifests/postgres/kustomization.yaml
@@ -7,3 +7,4 @@ patchesStrategicMerge:
  - ../mixins/argo-server-deployment.yaml
  - ../mixins/workflow-controller-configmap.yaml
  - ../mixins/workflow-controller-deployment.yaml
+ - ../mixins/cluster-workflow-template-rbac.yaml
diff --git a/test/e2e/testdata/cluster-workflow-template-nested-template.yaml b/test/e2e/testdata/cluster-workflow-template-nested-template.yaml
@@ -1,19 +1,3 @@
-kind: ClusterWorkflowTemplate
-metadata:
- name: cluster-workflow-template-whalesay-template
- labels:
- argo-e2e: true
-spec:
- templates:
- - name: whalesay-template
- inputs:
- parameters:
- - name: message
- container:
- image: docker/whalesay
- command: [cowsay]
- args: ["{{inputs.parameters.message}}"]
----
 apiVersion: argoproj.io/v1alpha1
 kind: ClusterWorkflowTemplate
 metadata:

diff --git a/test/e2e/workflow_template_test.go b/test/e2e/workflow_template_test.go
@@ -33,8 +33,13 @@ func (s *WorkflowTemplateSuite) TestSubmitWorkflowTemplate() {
 }
 
 func (s *WorkflowTemplateSuite) TestNestedWorkflowTemplate() {
- s.Given().WorkflowTemplate("@smoke/workflow-template-whalesay-template.yaml").
+ s.Given().
  WorkflowTemplate("@testdata/workflow-template-nested-template.yaml").
+ When().Given().
+ WorkflowTemplate("@smoke/workflow-template-whalesay-template.yaml").
+ When().
+ CreateWorkflowTemplates().
+ Given().
  Workflow(`apiVersion: argoproj.io/v1alpha1
 kind: Workflow
 metadata:
@@ -45,15 +50,16 @@ spec:
  entrypoint: whalesay
  templates:
  - name: whalesay
- inputs:
- parameters:
- - name: message
- value: hello from nested
- templateRef:
- name: workflow-template-nested-template
- template: whalesay-template
+ steps:
+ - - name: call-whalesay-template
+ templateRef:
+ name: workflow-template-nested-template
+ template: whalesay-template
+ arguments:
+ parameters:
+ - name: message
+ value: "hello from nested"
 `).When().
- CreateWorkflowTemplates().
  SubmitWorkflow().
  WaitForWorkflow(30 * time.Second).
  Then().