Merge ~pwlars/snappy-hwe-snaps/+git/jenkins-jobs:fix-snap-build-proxy into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

Proposed by Paul Larson
Status: Merged
Approved by: Jim Hodapp
Approved revision: 5daee2e475089cd61d53255c06542117737885b6
Merged at revision: a077e9876c0194af1931c4d7460512f728edff79
Proposed branch: ~pwlars/snappy-hwe-snaps/+git/jenkins-jobs:fix-snap-build-proxy
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 13 lines (+1/-1)
1 file modified
jobs/snap/snap-build-worker.sh (+1/-1)
Reviewer Review Type Date Requested Status
Jim Hodapp (community) Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+328795@code.launchpad.net

Description of the change

hohot and brando snap-build-worker jobs are getting errors like this:
E: Failed to fetch http://archive.ubuntu.com/ubuntu/dists/xenial-updates/main/binary-amd64/Packages Cannot initiate the connection to 3128:80 (0.0.12.56). - connect (22: Invalid argument)

This looks like it's actually due to two problems:
1. not putting http:// in the proxy address causes strange side effects (0.0.12.56 is 3128 translated)
2. on brando only - ports.ubuntu.com is not allowed through the proxy for these jenkaas nodes. I'll fix that in another MP against the puppet configs that IS uses. ubuntu.archive.com is globally allowed, so we don't need to be concerned about that one

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/snap/snap-build-worker.sh b/jobs/snap/snap-build-worker.sh
2index 60775d7..1c32dec 100644
3--- a/jobs/snap/snap-build-worker.sh
4+++ b/jobs/snap/snap-build-worker.sh
5@@ -99,7 +99,7 @@ if [ "$BUILD_ON_LAUNCHPAD" = False ]; then
6 --results-dir=$WORKSPACE/results \
7 --arch=$ARCHITECTURE \
8 --series=$SERIES \
9- --proxy=squid.internal:3128 \
10+ --proxy=http://squid.internal:3128 \
11 $SNAPBUILD_EXTRA_ARGS
12 else
13 git remote add jenkins-ci git+ssh://$BOT_USERNAME@git.launchpad.net/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/$CI_REPO

Subscribers

People subscribed via source and target branches

to all changes: