From 3f86b74437198d13d27f8b09d9ceb9dd97867401 Mon Sep 17 00:00:00 2001 From: yxxhero Date: Thu, 27 Apr 2023 09:20:41 +0800 Subject: [PATCH] fix tests Signed-off-by: yxxhero --- .../output.yaml | 4 ++-- .../output.yaml | 4 ++-- .../helmfile/testdata/snapshot/postrenderer/output.yaml | 4 ++-- .../helmfile/testdata/snapshot/pr_560/output.yaml | 4 ++-- .../snapshot/release_template_inheritance/output.yaml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) 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_within_same_yaml_part/output.yaml index 603e75cd..be8b8838 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_within_same_yaml_part/output.yaml @@ -1,7 +1,7 @@ Warning: environments and releases cannot be defined within the same YAML part. Use --- to extract the environments into a dedicated part 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=$WD/testdata/charts/raw-0.0.1 -Templating release=raw, chart=$WD/testdata/charts/raw-0.0.1 +Building dependency release=raw, chart=../../charts/raw-0.0.1 +Templating release=raw, chart=../../charts/raw-0.0.1 --- # Source: raw/templates/resources.yaml chartVersion: 0.0.1 diff --git a/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml index 12a489b5..ca434208 100644 --- a/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml +++ b/test/e2e/template/helmfile/testdata/snapshot/environments_values_gotmpl_with_environment_name/output.yaml @@ -1,5 +1,5 @@ -Building dependency release=raw, chart=$WD/testdata/charts/raw-0.0.1 -Templating release=raw, chart=$WD/testdata/charts/raw-0.0.1 +Building dependency release=raw, chart=../../charts/raw-0.0.1 +Templating release=raw, chart=../../charts/raw-0.0.1 --- # Source: raw/templates/resources.yaml envName: test diff --git a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml index f8e04138..f71b03aa 100644 --- a/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml +++ b/test/e2e/template/helmfile/testdata/snapshot/postrenderer/output.yaml @@ -1,10 +1,10 @@ -Building dependency release=foo, chart=$WD/testdata/charts/raw-0.1.0 +Building dependency release=foo, chart=../../charts/raw-0.1.0 Building dependency release=baz, chart=$WD/temp1/baz Saving 1 charts Downloading raw from repo oci://localhost:5001/myrepo Deleting outdated charts -Templating release=foo, chart=$WD/testdata/charts/raw-0.1.0 +Templating release=foo, chart=../../charts/raw-0.1.0 --- # Source: raw/templates/resources.yaml apiVersion: v1 diff --git a/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml index 2acda770..4c93a8b9 100644 --- a/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml +++ b/test/e2e/template/helmfile/testdata/snapshot/pr_560/output.yaml @@ -1,5 +1,5 @@ -Building dependency release=foo, chart=$WD/testdata/charts/raw-0.1.0 -Templating release=foo, chart=$WD/testdata/charts/raw-0.1.0 +Building dependency release=foo, chart=../../charts/raw-0.1.0 +Templating release=foo, chart=../../charts/raw-0.1.0 --- # Source: raw/templates/resources.yaml apiVersion: v1 diff --git a/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml b/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml index 6d523183..8f4523d9 100644 --- a/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml +++ b/test/e2e/template/helmfile/testdata/snapshot/release_template_inheritance/output.yaml @@ -1,9 +1,9 @@ Adding repo myrepo http://localhost:18084/ "myrepo" has been added to your repositories -Building dependency release=foo1, chart=$WD/testdata/charts/raw-0.1.0 -Building dependency release=foo2, chart=$WD/testdata/charts/raw-0.1.0 -Templating release=foo1, chart=$WD/testdata/charts/raw-0.1.0 +Building dependency release=foo1, chart=../../charts/raw-0.1.0 +Building dependency release=foo2, chart=../../charts/raw-0.1.0 +Templating release=foo1, chart=../../charts/raw-0.1.0 --- # Source: raw/templates/resources.yaml apiVersion: v1 @@ -17,7 +17,7 @@ data: template1: template1 template1Label: template1 -Templating release=foo2, chart=$WD/testdata/charts/raw-0.1.0 +Templating release=foo2, chart=../../charts/raw-0.1.0 --- # Source: raw/templates/resources.yaml apiVersion: v1