Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/infra-install-fixes into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

* infra: the proxy is already exported by the common prepare script
* infra: use noninteractive frontend for deb installs
* infra: differentiate between http and https proxy

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:1e57ec949fdbe2060769f7ba81f2ae2f9a96a280
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/519/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-worker/569
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/570
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-test/568
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/536/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/519/rebuild

review: Approve (continuous-integration)

[Oliver Grawert (ogra)]

LGTM

review: Approve

[Roberto Mier Escandon (rmescandon)]

lgtm

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:47d0b9686c1109796f45362eb167fc64de70d63c
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/520/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build-worker/570
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-docs/571
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-test/569
    None: https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-update-mp/537/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/snappy-hwe-snaps-snap-build/520/rebuild

review: Approve (continuous-integration)

diff --git a/jobs/infrastructure/common-job-prepare.sh b/jobs/infrastructure/common-job-prepare.sh
index 64d6c05..eef6f39 100644
--- a/jobs/infrastructure/common-job-prepare.sh
+++ b/jobs/infrastructure/common-job-prepare.sh
@@ -33,10 +33,13 @@ if [ -n "${{CLEANUP_WORKSPACE}}" ] && [ "${{CLEANUP_WORKSPACE}}" -eq 1 ]; then
 fi
 
 # Setup a proxy if the project wants to use one
-PROXY="{proxy}"
-if [ -n "$PROXY" ]; then
+HTTP_PROXY="{http_proxy}"
+if [ -n "$HTTP_PROXY" ]; then
 	export http_proxy=$PROXY
-	export https_proxy=$PROXY
+fi
+HTTPS_PROXY="{https_proxy}"
+if [ -n "$HTTPS_PROXY" ]; then
+	export https_proxy=$HTTPS_PROXY
 fi
 
 cat << EOF > $WORKSPACE/.build_env
diff --git a/jobs/infrastructure/prepare-0-install.sh b/jobs/infrastructure/prepare-0-install.sh
index bb47272..3d2fb34 100644
--- a/jobs/infrastructure/prepare-0-install.sh
+++ b/jobs/infrastructure/prepare-0-install.sh
@@ -16,19 +16,24 @@
 
 set -ex
 
-sudo apt-get install --yes software-properties-common
+# Use correct home and preserve environment variables when calling `sudo ...`
+SUDO="sudo -E -H"
+
+export DEBIAN_FRONTEND=noninteractive
+
+$SUDO apt-get install --yes software-properties-common
 
 # build tools as used in Launchpad
-sudo add-apt-repository --yes ppa:launchpad/buildd-staging
-sudo add-apt-repository --yes ppa:jenkaas-hackers/tools
-sudo add-apt-repository --yes ppa:snappy-hwe-team/ci-tools
+$SUDO add-apt-repository --yes ppa:launchpad/buildd-staging
+$SUDO add-apt-repository --yes ppa:jenkaas-hackers/tools
+$SUDO add-apt-repository --yes ppa:snappy-hwe-team/ci-tools
 
-sudo apt-get update
+$SUDO apt-get update
 
-echo "postfix postfix/mailname string $(hostname)" | sudo debconf-set-selections
-echo  "postfix postfix/main_mailer_type string 'Internet Site'" | sudo debconf-set-selections
+echo "postfix postfix/mailname string $(hostname)" | $SUDO debconf-set-selections
+echo  "postfix postfix/main_mailer_type string 'Internet Site'" | $SUDO debconf-set-selections
 
-sudo apt-get install --yes \
+$SUDO apt-get install --yes \
     git \
     python \
     python-launchpadlib \
@@ -55,13 +60,6 @@ sudo apt-get install --yes \
     snapcraft \
     {install_packages}
 
-export http_proxy="http://squid.internal:3128/"
-export https_proxy="http://squid.internal:3128/"
-
-# Use correct home and preserve environment variables when calling
-# `sudo pip[3] ...` below. pip otherwise fails to run.
-SUDO="sudo -E -H"
-
 # Install additional sofware from the python package database
 $SUDO pip install --upgrade pip
 $SUDO pip install jenkins-job-builder
diff --git a/local.yaml b/local.yaml
index c5b7820..8703421 100644
--- a/local.yaml
+++ b/local.yaml
@@ -17,7 +17,8 @@
     install_packages: ""
     build_slaves:
         - master
-    proxy: ""
+    http_proxy: ""
+    https_proxy: ""
     jobs:
         - infrastructure-jobs
 
@@ -36,7 +37,7 @@
     update_mps: false
     run_tests: false
     build_on_launchpad: false
-    trigger_ci: false
+    trigger_ci: true
     auto_merge: false
 
     build_architectures: [amd64]