diff --git a/tools/airship-in-a-pod/runner/assets/entrypoint.sh b/tools/airship-in-a-pod/runner/assets/entrypoint.sh index e9a6085d1..be56aa66b 100755 --- a/tools/airship-in-a-pod/runner/assets/entrypoint.sh +++ b/tools/airship-in-a-pod/runner/assets/entrypoint.sh @@ -76,7 +76,10 @@ fi ./tools/deployment/23_pull_documents.sh ./tools/deployment/23_generate_secrets.sh -repo_name=$(yq -r .manifests.dummy_manifest.repositories.primary.url /root/.airship/config | awk 'BEGIN {FS="/"} {print $NF}' | cut -d'.' -f1) +repo_url=$(yq -r .manifests.dummy_manifest.repositories.primary.url /root/.airship/config) +repo_name=$(basename ${repo_url}) +# Remove .git from repository if present +repo_name=${repo_name%.git} hosts_file="$AIRSHIP_CONFIG_MANIFEST_DIRECTORY/$repo_name/manifests/site/test-site/target/catalogues/shareable/hosts.yaml" sed -i -e 's#bmcAddress: redfish+http://\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\):8000#bmcAddress: redfish+https://10.23.25.1:8443#' "$hosts_file" sed -i -e 's#root#username#' "$hosts_file" diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 453484f3d..16553038c 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -41,7 +41,7 @@ # - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up - airship-airshipctl-gate-script-runner-docker - airship-aiap-build-image - # - airship-airship-in-a-pod-script-runner + - airship-airship-in-a-pod-script-runner experimental: jobs: - airship-airshipctl-docker-kubebench-conformance