fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-02 17:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/jenkins: set dependent configuration parameters and print more information

Browse source 
Some parameters, such as RPM,DIST,DISTCHECK imply/conflict each other. Improve
the script to set the dependencies. Otherwise, it might be unexpected that the
build script does DISTCHECK, when enabling RPM.

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-05-14 14:56:46 +02:00
parent dd96096543
commit f40c36ce7d
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
contrib/rh-jenkins/trigger_build.sh
View file

@ -129,6 +129,7 @@ else
DISTCHECK=no
_DISTCHECK=false
fi
__DISTCHECK=$DISTCHECK
if eval_bool "$DIST" 0; then
DIST=yes
@ -137,9 +138,13 @@ else
DIST=no
_DIST=false
fi
__DIST=$DIST
if [[ "$DIST" == yes && "$DISTCHECK" == yes ]]; then
echo "WARNING: DIST and DISTCHECK cannot be both true. DIST will be ignored."
if [[ "$RPM" == yes ]]; then
DISTCHECK=yes
_DISTCHECK=true
fi
if [[ "$DISTCHECK" == yes ]]; then
DIST=no
_DIST=false
fi
@ -150,12 +155,21 @@ fi
echo "USER : \"$_USER\""
echo "TOKEN : \"$_TOKEN\""
echo "DRY_RUN : $DRY_RUN"
echo "RPM : $RPM"
echo "NO_CHECK_UPSTREAM : $NO_CHECK_UPSTREAM"
echo "DRY_RUN : $DRY_RUN"
echo
echo "OUT_OF_TREE_BUILD : $OUT_OF_TREE_BUILD"
if [[ $__DIST != $DIST ]]; then
echo "DIST : $DIST (conflicts with DISTCHECK)"
else
echo "DIST : $DIST"
fi
if [[ $__DISTCHECK != $DISTCHECK ]]; then
echo "DISTCHECK : $DISTCHECK (implied by RPM)"
else
echo "DISTCHECK : $DISTCHECK"
fi
echo "RPM : $RPM"
for _BRANCH in "${REFS[@]}"; do
_B="$(git rev-parse -q --verify "$_BRANCH")" || die "Error parsing revision \"$_BRANCH\""