airship/airshipctl
Code Issues Proposed changes

Remove .git from repository URL

Browse Source 
* Enable airship-airship-in-a-pod-script-runner as non-voting
  Job at check stage

Change-Id: I591fb1fb97cfe00bcfbe2196b4b7533a60dc276e
This commit is contained in:
Siraj Yasin 2021-10-19 13:05:26 +00:00
parent af957ee1e6
commit 426bc5e02b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/airship-in-a-pod/runner/assets/entrypoint.sh
View File

@ -76,7 +76,10 @@ fi
./tools/deployment/23_pull_documents.sh ./tools/deployment/23_pull_documents.sh
./tools/deployment/23_generate_secrets.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" 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#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" sed -i -e 's#root#username#' "$hosts_file"

2
zuul.d/projects.yaml
View File

@ -41,7 +41,7 @@
# - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up # - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
- airship-airshipctl-gate-script-runner-docker - airship-airshipctl-gate-script-runner-docker
- airship-aiap-build-image - airship-aiap-build-image
# - airship-airship-in-a-pod-script-runner - airship-airship-in-a-pod-script-runner
experimental: experimental:
jobs: jobs:
- airship-airshipctl-docker-kubebench-conformance - airship-airshipctl-docker-kubebench-conformance