Merge pull request #3095 from Nordix/tero/fix-e2e-data-yaml

🌱 Create ironic.yaml for the e2e tests from a template file

Author: metal3-io-bot

.gitignore

@@ -5,6 +5,7 @@ build/_test
 _artifacts
 artifacts*.tar.gz
 test/e2e/images
+test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml
 out
 
 # Created by https://www.gitignore.io/api/go

hack/ci-e2e.sh

@@ -58,7 +58,7 @@ export PATH="/usr/local/go/bin:${PATH}"
 "${REPO_ROOT}/hack/e2e/ensure_yq.sh"
 
 sudo apt-get update
-sudo apt-get install -y libvirt-dev pkg-config
+sudo apt-get install -y libvirt-dev pkg-config gettext-base
 
 # Increase inotify limits to prevent "too many open files" errors.
 # Kind nodes (Docker containers running systemd) consume inotify resources heavily.
@@ -225,7 +225,10 @@ IRSO_IRONIC_AUTH_DIR="${REPO_ROOT}/test/e2e/data/ironic-standalone-operator/comp
 echo "${IRONIC_USERNAME}" > "${IRSO_IRONIC_AUTH_DIR}/ironic-username"
 echo "${IRONIC_PASSWORD}" > "${IRSO_IRONIC_AUTH_DIR}/ironic-password"
 
-sed -i "s|SSH_PUB_KEY_CONTENT|${pub_ssh_key}|" "${REPO_ROOT}"/test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml
+# shellcheck disable=SC2016
+SSH_PUB_KEY_CONTENT="${pub_ssh_key}" envsubst '${SSH_PUB_KEY_CONTENT}' < \
+  "${REPO_ROOT}/test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml.tmpl" > \
+  "${REPO_ROOT}/test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml"
 
 # We need to gather artifacts/logs before exiting also if there are errors
 set +e

…ndalone-operator/ironic/base/ironic.yaml …ne-operator/ironic/base/ironic.yaml.tmpltest/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml renamed to test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml.tmpl test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml renamed to test/e2e/data/ironic-standalone-operator/ironic/base/ironic.yaml.tmpl

@@ -18,5 +18,5 @@ spec:
     ipAddress: "192.168.222.2"
     ipAddressManager: "keepalived"
   deployRamdisk:
-    sshKey: "SSH_PUB_KEY_CONTENT"
+    sshKey: "${SSH_PUB_KEY_CONTENT}"
     extraKernelParams: "console=ttyS0"