From f3f2adf1b1ba435709e9023131bcc7888dd2168c Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Wed, 7 Jun 2023 14:30:04 +0300 Subject: [PATCH] hack Signed-off-by: Gabriel Adrian Samfira --- kola/tests/misc/cloudinit.go | 2 +- platform/conf/conf.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kola/tests/misc/cloudinit.go b/kola/tests/misc/cloudinit.go index d5e115656..2a78e7f94 100644 --- a/kola/tests/misc/cloudinit.go +++ b/kola/tests/misc/cloudinit.go @@ -231,7 +231,7 @@ func CloudInitMultipartMime(c cluster.TestCluster) { // All files should have the same content (42). These files should have been created by the cloud-config part // that declares the write_files option. - c.MustSSH(m, "for $file in /tmp/kola_*; do OUT=$(cat $file); if [ $OUT != 42 ]; then exit 1; fi; done") + c.MustSSH(m, `for f in $(ls /tmp/kola_*); do OUT=$(cat $f); if [ "$OUT" != 42 ]; then exit 1; fi; done`) // Check that the x-shellscript part was executed. c.MustSSH(m, "test -f /coreos-cloudinit_multipart.txt") c.MustSSH(m, "test -f /kola_undercover") diff --git a/platform/conf/conf.go b/platform/conf/conf.go index cac2d526e..063c911fe 100644 --- a/platform/conf/conf.go +++ b/platform/conf/conf.go @@ -1270,7 +1270,7 @@ func (c *Conf) copyKeysScript(keys []*agent.Key) { func (c *Conf) copyKeysMultipartMime(keys []*agent.Key) { keysAsStrings := keysToStrings(keys) header := textproto.MIMEHeader{ - "Content-Type": []string{"text/plain; charset=\"us-ascii\""}, + "Content-Type": []string{"text/cloud-config; charset=\"us-ascii\""}, "MIME-Version": []string{"1.0"}, "Content-Transfer-Encoding": []string{"7bit"}, "Content-Disposition": []string{"attachment; filename=\"testing-keys.yaml\""},