summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-09-20 10:44:32 +0000
committerintrigeri <intrigeri@boum.org>2019-09-20 10:44:32 +0000
commit0b52c1b2ef496ca4aa7538c32a26818734d23434 (patch)
treedab6dd4b369e2aaae536c4b68c6d139d637ffb00
parent7a98d4a221520704c9801bba3e7a44f9548a8ec9 (diff)
Don't use apt-cacher-ng when building images (#11940)
The vast majority of the files we're retrieving with APT during a build are hosted locally on apt.lizard (in APT snapshots), so it makes little sense to go through a caching proxy here. Let's see if dropping this intermediary makes the build faster or breaks stuff (e.g. it might be that we need to adjust firewalling or name resolution).
-rw-r--r--macros/builders.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros/builders.yaml b/macros/builders.yaml
index a763e4e..d1beafe 100644
--- a/macros/builders.yaml
+++ b/macros/builders.yaml
@@ -29,7 +29,7 @@
- builder:
name: build_Tails_ISO
builders:
- - shell: "http_proxy=http://192.168.122.10:3142 TAILS_BUILD_OPTIONS='ram extproxy forcecleanup defaultcomp mergebasebranch' ARTIFACTS='build-artifacts/' rake build"
+ - shell: "TAILS_BUILD_OPTIONS='ram noproxy forcecleanup defaultcomp mergebasebranch' ARTIFACTS='build-artifacts/' rake build"
- builder:
name: decide_if_reproduce
@@ -39,7 +39,7 @@
- builder:
name: try_reproduce_Tails_ISO_if_needed
builders:
- - shell: "if [ -f \"${WORKSPACE}/tmp/tails-reproduce\" ]; then http_proxy=http://192.168.122.10:3142 TAILS_BUILD_OPTIONS=\"ram extproxy forcecleanup defaultcomp mergebasebranch dateoffset=+8 cpus=$(($(nproc) - 1)) cpumodel=qemu64\" ARTIFACTS='build-artifacts/2/' GIT_COMMIT=\"${UPSTREAMJOB_GIT_COMMIT}\" BASE_BRANCH_GIT_COMMIT=\"${UPSTREAMJOB_GIT_BASE_BRANCH_HEAD}\" rake build; fi"
+ - shell: "if [ -f \"${WORKSPACE}/tmp/tails-reproduce\" ]; then TAILS_BUILD_OPTIONS=\"ram noproxy forcecleanup defaultcomp mergebasebranch dateoffset=+8 cpus=$(($(nproc) - 1)) cpumodel=qemu64\" ARTIFACTS='build-artifacts/2/' GIT_COMMIT=\"${UPSTREAMJOB_GIT_COMMIT}\" BASE_BRANCH_GIT_COMMIT=\"${UPSTREAMJOB_GIT_BASE_BRANCH_HEAD}\" rake build; fi"
- builder:
name: make_artifact_directory