From 11c6bfda3b042c258c7172c17237b519b1f6ed2a Mon Sep 17 00:00:00 2001 From: yxxhero Date: Tue, 4 Feb 2025 08:34:28 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- .../environments_releases_within_same_yaml_part/config.yaml | 5 ----- .../environments_releases_without_same_yaml_part/config.yaml | 5 +++++ .../input.yaml.gotmpl | 2 +- .../output.yaml | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/config.yaml create mode 100644 test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/config.yaml rename test/e2e/template/helmfile/testdata/snapshot/{environments_releases_within_same_yaml_part => environments_releases_without_same_yaml_part}/input.yaml.gotmpl (97%) rename test/e2e/template/helmfile/testdata/snapshot/{environments_releases_within_same_yaml_part => environments_releases_without_same_yaml_part}/output.yaml (56%) diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/config.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/config.yaml deleted file mode 100644 index 71fee0cb..00000000 --- a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -chartifyTempDir: envs_releases_within_same_yaml_part -helmfileArgs: -- --environment -- prod -- template diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/config.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/config.yaml new file mode 100644 index 00000000..690947ac --- /dev/null +++ b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/config.yaml @@ -0,0 +1,5 @@ +chartifyTempDir: envs_releases_without_same_yaml_part +helmfileArgs: +- --environment +- prod +- template diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/input.yaml.gotmpl b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/input.yaml.gotmpl similarity index 97% rename from test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/input.yaml.gotmpl rename to test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/input.yaml.gotmpl index 276a4d93..4fc99ecb 100644 --- a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/input.yaml.gotmpl +++ b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/input.yaml.gotmpl @@ -1,7 +1,7 @@ environments: prod: staging: - +--- releases: - name: raw chart: ../../charts/raw-0.0.1 diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml similarity index 56% rename from test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/output.yaml rename to test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml index 2e9471ac..7f723eaa 100644 --- a/test/e2e/template/helmfile/testdata/snapshot/environments_releases_within_same_yaml_part/output.yaml +++ b/test/e2e/template/helmfile/testdata/snapshot/environments_releases_without_same_yaml_part/output.yaml @@ -1,4 +1,3 @@ -WARNING: environments and releases cannot be defined within the same YAML part. Use --- to extract the environments into a dedicated part Building dependency release=raw, chart=../../charts/raw-0.0.1 Templating release=raw, chart=../../charts/raw-0.0.1 ---