diff options
-rw-r--r-- | TODO | 1 | ||||
-rwxr-xr-x | bin/reproducible_build_archlinux_pkg.sh | 2 | ||||
-rwxr-xr-x | bin/reproducible_common.sh | 3 | ||||
-rwxr-xr-x | bin/reproducible_maintenance.sh | 8 |
4 files changed, 11 insertions, 3 deletions
@@ -304,7 +304,6 @@ This is about Debian, below are more todo entries for other projects… ** needs to be made idempotent ** needs to download bootstrap.tar.gz sig and verify ** once this has been done, run it more often than once a year -* use regular maintenace job to update the arch schroot: 'schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- pacman -Syu --noconfirm' * arch build.sh: ** introduce more variations: USER ** confirm the others are really working diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index 5bc20871..c0a651b6 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -169,7 +169,7 @@ second_build() { remote_build() { local BUILDNR=$1 - local NODE=profitbricks-build3-amd64.debian.net + local NODE=$ARCHLINUX_BUILD_NODE local PORT=22 set +e ssh -p $PORT $NODE /bin/true diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index 27bd4c7f..3cf48761 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -52,7 +52,8 @@ BUILD_ENV_VARS="ARCH NUM_CPU CPU_MODEL DATETIME KERNEL1 KERNEL2" # these also ne # existing usertags in the Debian BTS USERTAGS="toolchain infrastructure timestamps fileordering buildpath username hostname uname randomness buildinfo cpu signatures environment umask ftbfs locale" -# archlinux repositories to be tested +# common settings for testing Archlinux +ARCHLINUX_BUILD_NODE=profitbricks-build3-amd64.debian.net ARCHLINUX_REPOS="core extra" # number of cores to be used diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh index 755987d7..a2525c9d 100755 --- a/bin/reproducible_maintenance.sh +++ b/bin/reproducible_maintenance.sh @@ -41,6 +41,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then cp -v $PACKAGES_DB $BASE/ fi +# for Debian echo "$(date -u) - updating the schroots and pbuilder now..." set +e # use host architecture (only) @@ -101,6 +102,13 @@ for s in $SUITES ; do done set -e +# for Archlinux +if [ "$HOSTNAME" = "$ARCHLINUX_BUILD_NODE" ] ; then + echo "$(date -u) - updating Archlinux schroot now." + schroot --directory /tmp -c source:jenkins-reproducible-archlinux -u root -- pacman -Syu --noconfirm + echo "$(date -u) - updating Archlinux schroot done." +fi + # delete old temp directories echo "$(date -u) - Deleting temp directories, older than 2 days." OLDSTUFF=$(find $REP_RESULTS -maxdepth 1 -type d -name "tmp.*" -mtime +1 -exec ls -lad {} \; || true) |