Skip to content

Commit 5816f1b

Browse files
authored
Merge pull request #74933 from aireilly/manual-cp-aireilly-fix-prow-smoke-test-script
fixing prow smoke test script
2 parents f0b6bc4 + 345eb03 commit 5816f1b

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

scripts/prow-smoke-test.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ DISTRO=$2
3333
PRODUCT_NAME=$3
3434
VERSION=$4
3535
ARCH=$(uname -m)
36-
if [[ $ARCH == x86_64 ]]; then
37-
TAG=latest
38-
elif [[ $ARCH == aarch64 ]]; then
36+
TAG=latest # Default tag
37+
SELINUX_LABEL=":Z"
38+
if [[ $ARCH == "aarch64" || $ARCH == "arm64" ]]; then
3939
TAG=multiarch
40+
SELINUX_LABEL=""
4041
fi
4142
CONTAINER_IMAGE=quay.io/redhat-docs/openshift-docs-asciidoc:$TAG
4243
SCRIPT_HEADSIZE=$(head -30 ${0} |grep -n "^# END_OF_HEADER" | cut -f1 -d:)
@@ -77,20 +78,20 @@ fi
7778
if [[ "$TEST" == "--preview" || "$TEST" == "-p" ]] && [[ -z "$DISTRO" ]]; then
7879
echo ""
7980
echo "🚧 Building with openshift-enterprise distro..."
80-
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}:Z $CONTAINER_IMAGE asciibinder build -d "$DISTRO"
81+
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}${SELINUX_LABEL} $CONTAINER_IMAGE asciibinder build -d "$DISTRO"
8182

8283
elif [[ "$TEST" == "--preview" || "$TEST" == "-p" ]] && [[ -n "$DISTRO" ]]; then
8384
echo ""
8485
echo "🚧 Building $DISTRO distro..."
85-
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}:Z $CONTAINER_IMAGE asciibinder build -d "$DISTRO"
86+
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}${SELINUX_LABEL} $CONTAINER_IMAGE asciibinder build -d "$DISTRO"
8687

8788
elif [[ "$TEST" == "--validate" || "$TEST" == "-v" ]]; then
8889
echo ""
8990
echo "🚧 Validating the docs..."
90-
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}:Z $CONTAINER_IMAGE sh -c 'scripts/check-asciidoctor-build.sh && python3 build_for_portal.py --distro '${DISTRO}' --product "'"${PRODUCT_NAME}"'" --version '${VERSION}' --no-upstream-fetch && python3 makeBuild.py'
91+
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}${SELINUX_LABEL} $CONTAINER_IMAGE sh -c 'scripts/check-asciidoctor-build.sh && python3 build_for_portal.py --distro '${DISTRO}' --product "'"${PRODUCT_NAME}"'" --version '${VERSION}' --no-upstream-fetch && python3 makeBuild.py'
9192

9293
elif [[ "$TEST" == "--lint-topicmaps" || "$TEST" == "-l" ]]; then
9394
echo ""
9495
echo "🚧 Linting the topicmap YAML..."
95-
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}:Z $CONTAINER_IMAGE sh -c 'yamllint _topic_maps'
96+
$CONTAINER_ENGINE run --rm -it -v "$(pwd)":${CONTAINER_WORKDIR}${SELINUX_LABEL} $CONTAINER_IMAGE sh -c 'yamllint _topic_maps'
9697
fi

0 commit comments

Comments
 (0)