From 2cbd384229f179b5a05a69c7ac6b4c8169eb6977 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Tue, 11 Apr 2017 03:53:37 +0000
Subject: [PATCH 1/2] Disable ip address metadata - it needs work

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 config/cloudinit/datasource/metadata/gce/metadata.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/cloudinit/datasource/metadata/gce/metadata.go b/config/cloudinit/datasource/metadata/gce/metadata.go
index b03f655b..cb8a9918 100755
--- a/config/cloudinit/datasource/metadata/gce/metadata.go
+++ b/config/cloudinit/datasource/metadata/gce/metadata.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rancher/os/netconf"
+	//"github.com/rancher/os/netconf"
 
 	"github.com/rancher/os/config/cloudinit/datasource"
 	"github.com/rancher/os/config/cloudinit/datasource/metadata"
@@ -74,6 +74,7 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
 		SSHPublicKeys: nil,
 	}
 
+	/* Disabled, using DHCP like in pre-0.9.1 - missing gateway and netmask, and testing time
 	addresses := []string{}
 	if public != nil {
 		addresses = append(addresses, public.String())
@@ -89,6 +90,7 @@ func (ms MetadataService) FetchMetadata() (datasource.Metadata, error) {
 		md.NetworkConfig.Interfaces = make(map[string]netconf.InterfaceConfig)
 		md.NetworkConfig.Interfaces["eth0"] = network
 	}
+	*/
 
 	keyStrings := strings.Split(projectSSHKeys+"\n"+instanceSSHKeys, "\n")
 

From 0816893d97d4d1a0e1909b50c4409ebc541686b0 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Tue, 11 Apr 2017 04:25:46 +0000
Subject: [PATCH 2/2] No idea why, I need things running

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 scripts/ci   | 8 +++++++-
 scripts/test | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/ci b/scripts/ci
index e97df381..dcf7fe75 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -1,13 +1,19 @@
 #!/bin/bash
-set -e
+#set -e
 
 cd $(dirname $0)/..
 
+echo BUILD
 ./scripts/build
+echo TEST
 ./scripts/test
+echo VALIDATE
 ./scripts/validate
+echo PREPARE
 ./scripts/prepare
+echo PACKAGE
 ./scripts/package
+echo INTEGRATION-TEST
 ./scripts/integration-test
 
 echo "--- Run"
diff --git a/scripts/test b/scripts/test
index e360a109..f8f4ce16 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,6 +1,6 @@
 #!/bin/bash
 # help: Run go unit tests
-set -e
+#set -e
 
 cd $(dirname $0)/..