From b921364ece363f0451f52a09e6415a1bc917c485 Mon Sep 17 00:00:00 2001 From: Ian Howell Date: Wed, 8 Sep 2021 16:35:53 -0500 Subject: [PATCH] AIAP: Fix filepath name for manifests AIAP was unable to modify certain manifest files when the manifest url ended in `.git`. This fixes that by stripping off the file extension from the target path directory. Change-Id: I3915deeb109fb1df726b27e1dd1deb1c987e39c5 --- tools/airship-in-a-pod/runner/assets/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/airship-in-a-pod/runner/assets/entrypoint.sh b/tools/airship-in-a-pod/runner/assets/entrypoint.sh index 9e34aedf3..21c8a1da4 100755 --- a/tools/airship-in-a-pod/runner/assets/entrypoint.sh +++ b/tools/airship-in-a-pod/runner/assets/entrypoint.sh @@ -63,7 +63,7 @@ fi echo "export KUBECONFIG=$HOME/.airship/kubeconfig" >> ~/.bashrc -repo_name=$(yq -r .manifests.dummy_manifest.repositories.primary.url /root/.airship/config | awk 'BEGIN {FS="/"} {print $NF}') +repo_name=$(yq -r .manifests.dummy_manifest.repositories.primary.url /root/.airship/config | awk 'BEGIN {FS="/"} {print $NF}' | cut -d'.' -f1) sed -i -e 's#bmcAddress: redfish+http://\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\):8000#bmcAddress: redfish+https://10.23.25.1:8443#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml" sed -i -e 's#root#username#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml" sed -i -e 's#r00tme#password#' "$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/hosts.yaml"