From ef0814c585bbae0e3a1a6f427461777f0a1e5762 Mon Sep 17 00:00:00 2001 From: Piyush Garg Date: Mon, 19 Dec 2022 16:38:58 +0530 Subject: [PATCH] Fix e2e test broken This will fix the issue of e2e test broken because a pipelinerun test is failing It is failing because of the respository getting cloned have changed the path of the file accessing This will update the path to a different file --- test/e2e/clustertask/start_test.go | 10 +++++----- test/e2e/pipeline/pipeline_test.go | 6 +++--- test/e2e/pipeline/start_test.go | 10 +++++----- test/e2e/task/start_test.go | 6 +++--- test/resources/output-pipelinerun.yaml | 2 +- test/resources/pipeline.yaml | 2 +- test/resources/read-file-clustertask.yaml | 2 +- test/resources/read-file.yaml | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/e2e/clustertask/start_test.go b/test/e2e/clustertask/start_test.go index 2ca0cbf49..b9f4807d5 100644 --- a/test/e2e/clustertask/start_test.go +++ b/test/e2e/clustertask/start_test.go @@ -93,7 +93,7 @@ func TestClusterTaskInteractiveStartE2E(t *testing.T) { t.Run("Start ClusterTask with flags", func(t *testing.T) { res := tkn.MustSucceed(t, "clustertask", "start", clusterTaskName, "-i=source="+tePipelineGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "-p=FILENAME=README.md", "-w=name=shared-workspace,emptyDir=", "--showlog") @@ -123,11 +123,11 @@ Waiting for logs to be available... if _, err := c.SendLine(string(terminal.KeyEnter)); err != nil { return err } - if _, err := c.ExpectString("Value for param `FILEPATH` of type `string`? (Default is `docs`)"); err != nil { + if _, err := c.ExpectString("Value for param `FILEPATH` of type `string`? (Default is `docs-v2`)"); err != nil { return err } - if _, err := c.ExpectString("(docs)"); err != nil { + if _, err := c.ExpectString("(docs-v2)"); err != nil { return err } if _, err := c.SendLine(string(terminal.KeyEnter)); err != nil { @@ -172,7 +172,7 @@ Waiting for logs to be available... CmdArgs: []string{ "clustertask", "start", clusterTaskName, "-i=source=" + tePipelineGitResourceName, - "--param=FILEPATH=docs", + "--param=FILEPATH=docs-v2", "-w=name=shared-workspace,emptyDir=", "--showlog", }, @@ -246,7 +246,7 @@ Waiting for logs to be available... tkn.MustSucceed(t, "clustertask", "start", clusterTaskName, "-i=source="+tePipelineGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "-p=FILENAME=README.md", "-w=name=shared-workspace,emptyDir=", "--showlog", diff --git a/test/e2e/pipeline/pipeline_test.go b/test/e2e/pipeline/pipeline_test.go index 5e5a2865b..4a9764d58 100644 --- a/test/e2e/pipeline/pipeline_test.go +++ b/test/e2e/pipeline/pipeline_test.go @@ -164,7 +164,7 @@ func TestPipelinesE2E(t *testing.T) { t.Run("Start PipelineRun using pipeline start command with SA as 'pipeline' ", func(t *testing.T) { res := tkn.MustSucceed(t, "pipeline", "start", tePipelineName, "-r=source-repo="+tePipelineGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "-p=FILENAME=README.md", "--showlog") @@ -477,7 +477,7 @@ func TestPipelinesNegativeE2E(t *testing.T) { t.Run("Start Pipeline Run using pipeline start command with SA as 'pipelines' ", func(t *testing.T) { res := tkn.MustSucceed(t, "pipeline", "start", tePipelineName, "-r=source-repo="+tePipelineFaultGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "-p=FILENAME=README.md", "--showlog", "true") @@ -664,7 +664,7 @@ func getCreateFileTask(taskname string, namespace string) *v1beta1.Task { Name: "read-docs-old", Image: "ubuntu", Command: []string{"/bin/bash"}, - Args: []string{"-c", "ls -la /workspace/damnworkspace/docs/README.md"}, + Args: []string{"-c", "ls -la /workspace/damnworkspace/docs-v2/README.md"}, }, { Name: "write-new-stuff", diff --git a/test/e2e/pipeline/start_test.go b/test/e2e/pipeline/start_test.go index cd355bfc5..eb6d42313 100644 --- a/test/e2e/pipeline/start_test.go +++ b/test/e2e/pipeline/start_test.go @@ -61,11 +61,11 @@ func TestPipelineInteractiveStartE2E(t *testing.T) { return err } - if _, err := c.ExpectString("Value for param `FILEPATH` of type `string`? (Default is `docs`)"); err != nil { + if _, err := c.ExpectString("Value for param `FILEPATH` of type `string`? (Default is `docs-v2`)"); err != nil { return err } - if _, err := c.ExpectString("(docs)"); err != nil { + if _, err := c.ExpectString("(docs-v2)"); err != nil { return err } @@ -132,7 +132,7 @@ func TestPipelineInteractiveStartE2E(t *testing.T) { tkn.RunInteractiveTests(t, &cli.Prompt{ CmdArgs: []string{ "pipeline", "start", "output-pipeline", - "-p=FILEPATH=docs", "--use-param-defaults", + "-p=FILEPATH=docs-v2", "--use-param-defaults", }, Procedure: func(c *expect.Console) error { if _, err := c.ExpectString("Choose the git resource to use for source-repo:"); err != nil { @@ -266,11 +266,11 @@ func TestPipelineInteractiveStartWithNewResourceE2E(t *testing.T) { return err } - if _, err := c.ExpectString("Value for param `FILEPATH` of type `string`? (Default is `docs`)"); err != nil { + if _, err := c.ExpectString("Value for param `FILEPATH` of type `string`? (Default is `docs-v2`)"); err != nil { return err } - if _, err := c.ExpectString("(docs)"); err != nil { + if _, err := c.ExpectString("(docs-v2)"); err != nil { return err } diff --git a/test/e2e/task/start_test.go b/test/e2e/task/start_test.go index 0087b41bb..25d54c3fa 100644 --- a/test/e2e/task/start_test.go +++ b/test/e2e/task/start_test.go @@ -73,7 +73,7 @@ func TestTaskStartE2E(t *testing.T) { t.Run("Start TaskRun using tkn start command with SA as 'pipeline' ", func(t *testing.T) { res := tkn.MustSucceed(t, "task", "start", "read-task", "-i=source="+tePipelineGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "-p=FILENAME=README.md", "--showlog") @@ -175,7 +175,7 @@ Waiting for logs to be available... CmdArgs: []string{ "task", "start", "read-task", "-i=source=" + tePipelineGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "--showlog", }, Procedure: func(c *expect.Console) error { @@ -255,7 +255,7 @@ Waiting for logs to be available... t.Run("Start TaskRun with --pod-template", func(t *testing.T) { tkn.MustSucceed(t, "task", "start", "read-task", "-i=source="+tePipelineGitResourceName, - "-p=FILEPATH=docs", + "-p=FILEPATH=docs-v2", "-p=FILENAME=README.md", "--showlog", "--pod-template="+helper.GetResourcePath("/podtemplate/podtemplate.yaml")) diff --git a/test/resources/output-pipelinerun.yaml b/test/resources/output-pipelinerun.yaml index 3bb5012bc..0feb46a66 100644 --- a/test/resources/output-pipelinerun.yaml +++ b/test/resources/output-pipelinerun.yaml @@ -44,7 +44,7 @@ spec: - name: read-docs-old image: ubuntu command: ["/bin/bash"] - args: ['-c', 'ls -la /workspace/damnworkspace/docs/README.md'] # tests that targetpath works + args: ['-c', 'ls -la /workspace/damnworkspace/README.md'] # tests that targetpath works - name: write-new-stuff image: ubuntu command: ['bash'] diff --git a/test/resources/pipeline.yaml b/test/resources/pipeline.yaml index fbcc0c80e..61e98a3d7 100644 --- a/test/resources/pipeline.yaml +++ b/test/resources/pipeline.yaml @@ -70,7 +70,7 @@ spec: type: git params: - name: FILEPATH - default: "docs" + default: "docs-v2" - name: FILENAME tasks: - name: first-create-file # 1. create file diff --git a/test/resources/read-file-clustertask.yaml b/test/resources/read-file-clustertask.yaml index d886f8e1d..132eede21 100644 --- a/test/resources/read-file-clustertask.yaml +++ b/test/resources/read-file-clustertask.yaml @@ -21,7 +21,7 @@ spec: - name: shared-workspace params: - name: FILEPATH - default: "docs" + default: "docs-v2" - name: FILENAME resources: inputs: diff --git a/test/resources/read-file.yaml b/test/resources/read-file.yaml index 587beec3b..7db0e2b6a 100644 --- a/test/resources/read-file.yaml +++ b/test/resources/read-file.yaml @@ -19,7 +19,7 @@ metadata: spec: params: - name: FILEPATH - default: "docs" + default: "docs-v2" - name: FILENAME resources: inputs: