From c52027332ff5e4bb4868dc3b747b95a9fc2827e4 Mon Sep 17 00:00:00 2001
From: Scott Hussey <sh8121@att.com>
Date: Tue, 24 Apr 2018 13:40:38 -0500
Subject: [PATCH] Update gate for Ubuntu 18.04 and proxy

- Remove apt conf for proxy, rely on environment
- Update schema to correctly support no_proxy
- Update build-image stage to support a proxy

Change-Id: Ie07a72ad35fde57596af88f838c8c1836b1e8510
---
 promenade/schemas/KubernetesNetwork.yaml      |  2 +-
 .../common/etc/apt/apt.conf.d/20-proxy.conf   |  5 -----
 tools/g2/stages/build-image.sh                | 22 ++++++++++++++++++-
 tools/setup_gate.sh                           |  4 ++--
 4 files changed, 24 insertions(+), 9 deletions(-)
 delete mode 100644 promenade/templates/roles/common/etc/apt/apt.conf.d/20-proxy.conf

diff --git a/promenade/schemas/KubernetesNetwork.yaml b/promenade/schemas/KubernetesNetwork.yaml
index 7d53016a..7da6de87 100644
--- a/promenade/schemas/KubernetesNetwork.yaml
+++ b/promenade/schemas/KubernetesNetwork.yaml
@@ -102,7 +102,7 @@ data:
         additional_no_proxy:
           type: array
           items:
-            $ref: '#/definitions/hostname_or_ip_address'
+            type: 'string'
         url:
           $ref: '#/definitions/url'
       required:
diff --git a/promenade/templates/roles/common/etc/apt/apt.conf.d/20-proxy.conf b/promenade/templates/roles/common/etc/apt/apt.conf.d/20-proxy.conf
deleted file mode 100644
index d101b7c3..00000000
--- a/promenade/templates/roles/common/etc/apt/apt.conf.d/20-proxy.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Generated by Promenade
-{% if config['KubernetesNetwork:proxy.url'] is defined -%}
-Acquire::http::Proxy "{{ config['KubernetesNetwork:proxy.url'] }}";
-Acquire::https::Proxy "{{ config['KubernetesNetwork:proxy.url'] }}";
-{% endif -%}
diff --git a/tools/g2/stages/build-image.sh b/tools/g2/stages/build-image.sh
index 52c804bc..6dd29106 100755
--- a/tools/g2/stages/build-image.sh
+++ b/tools/g2/stages/build-image.sh
@@ -4,8 +4,28 @@ set -e
 
 source "${GATE_UTILS}"
 
+CONFIG_PROXY=${HTTP_PROXY:-}
+
 log Building docker image "${IMAGE_PROMENADE}"
-docker build -q -t "${IMAGE_PROMENADE}" "${WORKSPACE}"
+
+if [[ -z "$CONFIG_PROXY" ]]
+then
+  docker build -q \
+    --network host \
+    -t "${IMAGE_PROMENADE}" \
+    "${WORKSPACE}"
+else
+    docker build -q \
+      --network host \
+      -t "${IMAGE_PROMENADE}" \
+      --build-arg HTTP_PROXY=${HTTP_PROXY} \
+      --build-arg HTTPS_PROXY=${HTTPS_PROXY} \
+      --build-arg NO_PROXY=${NO_PROXY} \
+      --build-arg http_proxy=${http_proxy} \
+      --build-arg https_proxy=${https_proxy} \
+      --build-arg no_proxy=${no_proxy} \
+      "${WORKSPACE}"
+fi
 
 log Loading Promenade image "${IMAGE_PROMENADE}" into local registry
 docker tag "${IMAGE_PROMENADE}" "localhost:5000/${IMAGE_PROMENADE}" &>> "${LOG_FILE}"
diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index f9c2aad8..d7954acf 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -32,9 +32,9 @@ sudo apt-get install -q -y --no-install-recommends \
     virtinst
 
 log_stage_header "Joining User Groups"
-for grp in docker libvirtd; do
+for grp in docker libvirtd libvirt; do
     if ! groups | grep $grp > /dev/null; then
-        sudo adduser "$(id -un)" $grp
+        sudo adduser "$(id -un)" $grp || echo "Group $grp not found, not added to user"
         REQUIRE_RELOG=1
     fi
 done