diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-12-13 18:44:42 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-12-13 18:44:42 +0100 |
| commit | a2da2820aedb5aac1ed5b84e67fda5bfd69f3226 (patch) | |
| tree | 4bd5ff880c517544e5bf8fa36cb13c78dc5a7928 | |
| parent | bb439f46fa0345c5c5e5e3421e8bcf92115a32ed (diff) | |
| download | jenkins.debian.net-a2da2820aedb5aac1ed5b84e67fda5bfd69f3226.tar.xz | |
reproducible rpms: mock can be used in parallel too
| -rw-r--r-- | TODO | 2 | ||||
| -rwxr-xr-x | bin/reproducible_build_archlinux_pkg.sh | 1 | ||||
| -rwxr-xr-x | bin/reproducible_build_rpm.sh | 3 | ||||
| -rwxr-xr-x | bin/reproducible_setup_mock.sh | 2 |
4 files changed, 6 insertions, 2 deletions
@@ -281,6 +281,8 @@ This is about Debian, below are more todo entries for other projects… ==== reproducible Fedora +* use mock in parallel with --uniqeext +** task: needs to be passed via ssh too (and we want ssh to do remote builds like debian from one master node) * setup script: ** mock --clean just uninstalls the chroot but it'll still be rebuilt next time using cache. you can delete the caches from /var/cache/mock/ or touch the mock config ** is /etc/yum/repos.d/fedora.repo really needed? diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh index d6f1a5e1..0bd25502 100755 --- a/bin/reproducible_build_archlinux_pkg.sh +++ b/bin/reproducible_build_archlinux_pkg.sh @@ -217,7 +217,6 @@ cd $TMPDIR TIMEOUT=8 # maximum time in hours for a single build DATE=$(date -u +'%Y-%m-%d %H:%M') START=$(date +'%s') -BUILDER="${JOB_NAME#reproducible_builder_}/${BUILD_ID}" DUMMY=$(mktemp -t archlinux-dummy-XXXXXXXX) # diff --git a/bin/reproducible_build_rpm.sh b/bin/reproducible_build_rpm.sh index 26fa444f..34e11e25 100755 --- a/bin/reproducible_build_rpm.sh +++ b/bin/reproducible_build_rpm.sh @@ -175,7 +175,6 @@ cd $TMPDIR DATE=$(date -u +'%Y-%m-%d %H:%M') START=$(date +'%s') -BUILDER="${JOB_NAME#reproducible_builder_}/${BUILD_ID}" DUMMY=$(mktemp -t rpm-dummy-XXXXXXXX) touch -d "$(date -u -d "6 hours ago" '+%Y-%m-%d %H:%M') UTC" $DUMMY RPM_STAMPS=/srv/reproducible-results/.rpm_stamp @@ -214,6 +213,8 @@ RELEASE="$1" ARCH="$2" SRCPACKAGE="" # package name SRC_RPM="" # src rpm file name +# not used yet: +UNIQEEXT="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 46704c2d..fe4d8656 100755 --- a/bin/reproducible_setup_mock.sh +++ b/bin/reproducible_setup_mock.sh @@ -17,6 +17,8 @@ if [ -z "$1" ] || [ -z "$2" ] ; then fi RELEASE=$1 ARCH=$2 +# not used yet: +UNIQEEXT="mock_${JOB_NAME#reproducible_builder_${RELEASE}_$ARCH}}" echo "$(date -u) - showing setup." dpkg -l mock |