summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-12-17 19:25:34 +0100
committerHolger Levsen <holger@layer-acht.org>2015-12-17 19:25:34 +0100
commitc89d6d8cc43ba2a5cec7f8089828e6eea533a813 (patch)
tree9916c2acb12809b7f624ecb0033027a00397f4f8
parent96a486a48a58dc9312489858ed5292f4eda4b2a4 (diff)
downloadjenkins.debian.net-c89d6d8cc43ba2a5cec7f8089828e6eea533a813.tar.xz
reproducible rpms: fix typo: s#uniqeext#uniqueext#g
-rwxr-xr-xbin/reproducible_build_rpm.sh14
-rwxr-xr-xbin/reproducible_setup_mock.sh14
2 files changed, 14 insertions, 14 deletions
diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh
index a13fe845..64c7bbd5 100755
--- a/bin/reproducible_build_rpm.sh
+++ b/bin/reproducible_build_rpm.sh
@@ -41,7 +41,7 @@ update_mock() {
touch -d "$(date -u -d "6 hours ago" '+%Y-%m-%d %H:%M') UTC" $DUMMY
if [ ! -f $STAMP ] || [ $DUMMY -nt $STAMP ] ; then
echo "$(date -u ) - updating mock for $RELEASE ($ARCH) on $HOSTNAME now..."
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=. --cleanup-after -v --update 2>&1
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. --cleanup-after -v --update 2>&1
echo "$(date -u ) - mock updated."
yum -v --releasever=23 check-update # FIXME: dont hard-code releasever here.
echo "$(date -u ) - yum updated."
@@ -109,7 +109,7 @@ first_build() {
local LOG=$TMPDIR/b1/$SRCPACKAGE/build1.log
# nicely run mock with a timeout of $TIMEOUT hours
timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=$RESULTDIR --cleanup-after -v --rebuild $SRC_RPM 2>&1 | tee -a $LOG
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=$RESULTDIR --cleanup-after -v --rebuild $SRC_RPM 2>&1 | tee -a $LOG
PRESULT=${PIPESTATUS[0]}
if [ $PRESULT -eq 124 ] ; then
echo "$(date -u) - mock was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
@@ -131,7 +131,7 @@ second_build() {
# NEW_NUM_CPU=$(echo $NUM_CPU-1|bc)
# nicely run mock with a timeout of $TIMEOUT hours
timeout -k $TIMEOUT.1h ${TIMEOUT}h /usr/bin/ionice -c 3 /usr/bin/nice \
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=$RESULTDIR --cleanup-after -v --rebuild $SRC_RPM 2>&1 | tee -a $LOG
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=$RESULTDIR --cleanup-after -v --rebuild $SRC_RPM 2>&1 | tee -a $LOG
PRESULT=${PIPESTATUS[0]}
if [ $PRESULT -eq 124 ] ; then
echo "$(date -u) - mock was killed by timeout after ${TIMEOUT}h." | tee -a $LOG
@@ -154,7 +154,7 @@ remote_build() {
sleep ${SLEEPTIME}m
exec /srv/jenkins/bin/abort.sh
fi
- ssh -p $PORT $FQDN /srv/jenkins/bin/reproducible_build_rpm.sh $BUILDNR $RELEASE $ARCH $UNIQEEXT ${SRCPACKAGE} ${TMPDIR}
+ ssh -p $PORT $FQDN /srv/jenkins/bin/reproducible_build_rpm.sh $BUILDNR $RELEASE $ARCH $UNIQUEEXT ${SRCPACKAGE} ${TMPDIR}
RESULT=$?
if [ $RESULT -ne 0 ] ; then
ssh -p $PORT $FQDN "rm -r $TMPDIR" || true
@@ -197,7 +197,7 @@ if [ "$1" = "1" ] || [ "$1" = "2" ] ; then
MODE="$1"
RELEASE="$2"
ARCH="$3"
- UNIQEEXT="$4"
+ UNIQUEEXT="$4"
SRCPACKAGE="$5"
TMPDIR="$6"
[ -d $TMPDIR ] || mkdir -p $TMPDIR
@@ -223,11 +223,11 @@ delay_start # randomize start times
# first, we need to choose a package…
RELEASE="$1"
ARCH="$2"
-UNIQEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
+UNIQUEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
SRCPACKAGE="" # package name
SRC_RPM="" # src rpm file name
# not used yet:
-UNIQEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
+UNIQUEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}"
#update_mock # FIXME: we dont have to run mock on the main node yet, but we will need at least have to update yum there…
choose_package
# build package twice
diff --git a/bin/reproducible_setup_mock.sh b/bin/reproducible_setup_mock.sh
index c39e901e..1ee8b95e 100755
--- a/bin/reproducible_setup_mock.sh
+++ b/bin/reproducible_setup_mock.sh
@@ -30,18 +30,18 @@ yum -v --releasever=23 check
yum -v --releasever=23 repolist all
for i in 1 2 ; do
- UNIQEEXT="mock_$i"
- echo "$(date -u) - starting to cleanly configure mock for $RELEASE on $ARCH using unique extension $UNIQEEXT."
+ UNIQUEEXT="mock_$i"
+ echo "$(date -u) - starting to cleanly configure mock for $RELEASE on $ARCH using unique extension $UNIQUEEXT."
echo "$(date -u) - mock --clean"
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=. -v --clean
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. -v --clean
echo "$(date -u) - mock --scrub=all"
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=. -v --scrub=all
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. -v --scrub=all
echo "$(date -u) - mock --init"
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=. -v --init
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. -v --init
echo "$(date -u) - mock --install rpm-build yum"
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=. -v --install rpm-build yum
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. -v --install rpm-build yum
echo "$(date -u) - mock --update"
- mock -r $RELEASE-$ARCH --uniqeext=$UNIQEEXT --resultdir=. -v --update
+ mock -r $RELEASE-$ARCH --uniqueext=$UNIQUEEXT --resultdir=. -v --update
done
# finally