From 3f7dd7914ba50cdb5ae8015fe2f6cb9fd917810d Mon Sep 17 00:00:00 2001
From: joshuabezaleel <joshua.bezaleel@gmail.com>
Date: Tue, 22 Feb 2022 11:12:40 +0700
Subject: [PATCH] Use existing porter.yaml for testing and remove the other one

Signed-off-by: joshuabezaleel <joshua.bezaleel@gmail.com>
---
 pkg/porter/build_integration_test.go          |  2 +-
 .../testdata/porter-with-custom-values.yaml   | 24 -------------------
 pkg/porter/testdata/porter.yaml               | 11 +++++----
 3 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 pkg/porter/testdata/porter-with-custom-values.yaml

diff --git a/pkg/porter/build_integration_test.go b/pkg/porter/build_integration_test.go
index 0b8f29dde0..5aca236c65 100644
--- a/pkg/porter/build_integration_test.go
+++ b/pkg/porter/build_integration_test.go
@@ -235,7 +235,7 @@ func TestPorter_BuildWithCustomValues(t *testing.T) {
 	p := NewTestPorter(t)
 	defer p.Teardown()
 
-	p.TestConfig.TestContext.AddTestFile("./testdata/porter-with-custom-values.yaml", config.Name)
+	p.TestConfig.TestContext.AddTestFile("./testdata/porter.yaml", config.Name)
 
 	err := p.LoadManifestFrom(config.Name)
 	require.NoError(t, err)
diff --git a/pkg/porter/testdata/porter-with-custom-values.yaml b/pkg/porter/testdata/porter-with-custom-values.yaml
deleted file mode 100644
index 121ed6e608..0000000000
--- a/pkg/porter/testdata/porter-with-custom-values.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: porter-hello
-version: 0.1.0
-description: "A bundle with a custom action"
-registry: getporter
-
-custom:
-  customKey1: "customValue1"
-
-mixins:
-  - exec
-
-install:
-  - exec:
-      description: "custom arguments"
-      command: echo
-      arguments:
-        - "{{ bundle.custom.customKey1 }}"
-
-uninstall:
-  - exec:
-      description: "Uninstall Hello World"
-      command: bash
-      flags:
-        c: echo Goodbye World
diff --git a/pkg/porter/testdata/porter.yaml b/pkg/porter/testdata/porter.yaml
index b68a61b3a5..4ca518f46a 100644
--- a/pkg/porter/testdata/porter.yaml
+++ b/pkg/porter/testdata/porter.yaml
@@ -3,6 +3,9 @@ version: 0.1.0
 description: "A bundle with a custom action"
 registry: getporter
 
+custom:
+  customKey1: "customValue1"
+
 credentials:
   - name: my-first-cred
     env: MY_FIRST_CRED
@@ -50,10 +53,10 @@ mixins:
 
 install:
   - exec:
-      description: "Install Hello World"
-      command: bash
-      flags:
-        c: echo Hello World
+      description: "Install Hello World with custom arguments"
+      command: echo
+      arguments:
+        - "{{ bundle.custom.customKey1 }}"
 
 upgrade:
   - exec: