Modified the test build to accept a list of variants to slimit the build
This commit is contained in:
parent
6888da3189
commit
e839bbbb50
25
functions.sh
25
functions.sh
|
@ -56,10 +56,29 @@ function get_variants() {
|
||||||
shift
|
shift
|
||||||
|
|
||||||
local arch
|
local arch
|
||||||
arch=$(get_arch)
|
local availablevariants
|
||||||
|
local variantsfilter
|
||||||
local variants
|
local variants
|
||||||
variants=$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')
|
|
||||||
echo "$variants"
|
arch=$(get_arch)
|
||||||
|
variantsfilter=( "$@" )
|
||||||
|
IFS=' ' read -ra availablevariants <<< "$(grep "^$arch" "$dir/architectures" | sed -E 's/'"$arch"'[[:space:]]*//' | sed -E 's/,/ /g')"
|
||||||
|
|
||||||
|
if [ ${#variantsfilter[@]} -gt 0 ]; then
|
||||||
|
for variant1 in "${availablevariants[@]}"; do
|
||||||
|
for variant2 in "${variantsfilter[@]}"; do
|
||||||
|
if [[ "$variant1" = "$variant2" ]]; then
|
||||||
|
variants+=("$variant1")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ ${#variants[@]} -gt 0 ]; then
|
||||||
|
echo "${variants[@]}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "${availablevariants[@]}"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Get supported architectures for a specific version and variant
|
# Get supported architectures for a specific version and variant
|
||||||
|
|
|
@ -70,8 +70,8 @@ for version in "${versions[@]}"; do
|
||||||
|
|
||||||
# Get supported variants according to the target architecture.
|
# Get supported variants according to the target architecture.
|
||||||
# See details in function.sh
|
# See details in function.sh
|
||||||
variants=$(get_variants "$(dirname "$version")")
|
IFS=' ' read -ra variants <<< "$(get_variants "$(dirname "$version")")"
|
||||||
for variant in $variants; do
|
for variant in "${variants[@]}"; do
|
||||||
# Skip non-docker directories
|
# Skip non-docker directories
|
||||||
[ -f "$version/$variant/Dockerfile" ] || continue
|
[ -f "$version/$variant/Dockerfile" ] || continue
|
||||||
|
|
||||||
|
|
|
@ -53,9 +53,9 @@ for version in "${versions[@]}"; do
|
||||||
|
|
||||||
# Get supported variants according to the target architecture.
|
# Get supported variants according to the target architecture.
|
||||||
# See details in function.sh
|
# See details in function.sh
|
||||||
variants=$(get_variants "$(dirname "$version")")
|
IFS=' ' read -ra variants <<< "$(IFS=','; get_variants "$(dirname "$version")" "$2")"
|
||||||
|
|
||||||
for variant in $variants; do
|
for variant in "${variants[@]}"; do
|
||||||
# Skip non-docker directories
|
# Skip non-docker directories
|
||||||
[ -f "$version/$variant/Dockerfile" ] || continue
|
[ -f "$version/$variant/Dockerfile" ] || continue
|
||||||
|
|
||||||
|
|
|
@ -85,9 +85,9 @@ for version in "${versions[@]}"; do
|
||||||
|
|
||||||
# Get supported variants according the target architecture
|
# Get supported variants according the target architecture
|
||||||
# See details in function.sh
|
# See details in function.sh
|
||||||
variants=$(get_variants "$parentpath")
|
IFS=' ' read -ra variants <<< "$(get_variants "$parentpath")"
|
||||||
|
|
||||||
for variant in $variants; do
|
for variant in "${variants[@]}"; do
|
||||||
# Skip non-docker directories
|
# Skip non-docker directories
|
||||||
[ -f "$version/$variant/Dockerfile" ] || continue
|
[ -f "$version/$variant/Dockerfile" ] || continue
|
||||||
add_stage "$baseuri" "$version" "$variant"
|
add_stage "$baseuri" "$version" "$variant"
|
||||||
|
|
Loading…
Reference in New Issue