Skip to content

Commit 0977beb

Browse files
authored
Merge pull request #74802 from aireilly/fix-prow-smoke-test-script
Don't set :Z label when mounting the container volume
2 parents 7f97509 + 8dea7c6 commit 0977beb

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

scripts/prow-smoke-test.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ DISTRO=$2
3333
PRODUCT_NAME=$3
3434
VERSION=$4
3535
ARCH=$(uname -m)
36-
TAG=latest # default tag
36+
TAG=latest # Default tag
37+
SELINUX_LABEL=":Z"
3738
if [[ $ARCH == "aarch64" || $ARCH == "arm64" ]]; then
3839
TAG=multiarch
40+
SELINUX_LABEL=""
3941
fi
4042
CONTAINER_IMAGE="quay.io/redhat-docs/openshift-docs-asciidoc:$TAG"
4143
SCRIPT_HEADSIZE=$(head -30 ${0} |grep -n "^# END_OF_HEADER" | cut -f1 -d:)
@@ -76,20 +78,20 @@ fi
7678
if [[ "$TEST" == "--preview" || "$TEST" == "-p" ]] && [[ -z "$DISTRO" ]]; then
7779
echo ""
7880
echo "🚧 Building with openshift-enterprise distro..."
79-
$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"
8082

8183
elif [[ "$TEST" == "--preview" || "$TEST" == "-p" ]] && [[ -n "$DISTRO" ]]; then
8284
echo ""
8385
echo "🚧 Building $DISTRO distro..."
84-
$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"
8587

8688
elif [[ "$TEST" == "--validate" || "$TEST" == "-v" ]]; then
8789
echo ""
8890
echo "🚧 Validating the docs..."
89-
$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'
9092

9193
elif [[ "$TEST" == "--lint-topicmaps" || "$TEST" == "-l" ]]; then
9294
echo ""
9395
echo "🚧 Linting the topicmap YAML..."
94-
$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'
9597
fi

0 commit comments

Comments
 (0)