From 3079d77028099577d4fee0a7477e2998fe2e030d Mon Sep 17 00:00:00 2001 From: Tim Pepper Date: Thu, 15 Dec 2016 08:45:11 -0800 Subject: [PATCH 1/2] ciao-down: update to golang 1.7.4 Golang 1.7.4 is available and ciao-down should use it instead of 1.7.3 Signed-off-by: Tim Pepper --- testutil/ciao-down/cloudinit.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testutil/ciao-down/cloudinit.go b/testutil/ciao-down/cloudinit.go index 837534a6a..be47a1fe3 100644 --- a/testutil/ciao-down/cloudinit.go +++ b/testutil/ciao-down/cloudinit.go @@ -77,12 +77,12 @@ runcmd: - curl -X PUT -d "Downloading Go" 10.0.2.2:{{.HTTPServerPort}} - echo "GOPATH={{.GoPath}}" >> /etc/environment - echo "PATH=$PATH:/usr/local/go/bin:{{$.GoPath}}/bin" >> /etc/environment - - {{template "PROXIES" .}}wget https://storage.googleapis.com/golang/go1.7.3.linux-amd64.tar.gz -O /tmp/go1.7.3.linux-amd64.tar.gz + - {{template "PROXIES" .}}wget https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz -O /tmp/go1.7.4.linux-amd64.tar.gz - {{template "CHECK" .}} - curl -X PUT -d "Unpacking Go" 10.0.2.2:{{.HTTPServerPort}} - - tar -C /usr/local -xzf /tmp/go1.7.3.linux-amd64.tar.gz + - tar -C /usr/local -xzf /tmp/go1.7.4.linux-amd64.tar.gz - {{template "CHECK" .}} - - rm /tmp/go1.7.3.linux-amd64.tar.gz + - rm /tmp/go1.7.4.linux-amd64.tar.gz - groupadd docker - sudo gpasswd -a {{.User}} docker From 2e33e060786a700aa682d45d1d7fc3616788fc0e Mon Sep 17 00:00:00 2001 From: Tim Pepper Date: Thu, 15 Dec 2016 12:08:27 -0800 Subject: [PATCH 2/2] ciao-controller: BAT expects that workload storage is ephemeral Commit c389aed9b22c360a522630a6d76ca71c8424acda breaks the BAT. This fixes it. Previously the workload storage csv had a persistent flag and it was set to true. My storage volumes extensions PR changed that to an ephemeral flag set to false. But prior to my PR, the user indicated flag was actually ignored in getStorage(). I introduced code to honor it instead of ignore and force in some cases persistence and in some ephemerality. BAT broke because it expected the example workload volumes to be ephemeral, despite not being flagged as such. Signed-off-by: Tim Pepper --- ciao-controller/tables/workload_storage.csv | 6 +++--- testutil/singlevm/tables/workload_storage.csv | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ciao-controller/tables/workload_storage.csv b/ciao-controller/tables/workload_storage.csv index e2e22455d..7861a6ce5 100644 --- a/ciao-controller/tables/workload_storage.csv +++ b/ciao-controller/tables/workload_storage.csv @@ -1,3 +1,3 @@ -79034317-3beb-447e-987d-4e310a8cf410,"",1,0,0,"image",73a86d7e-93c0-480e-9c41-ab42f69b7799,"" -e35ed972-c46c-4aad-a1e7-ef103ae079a2,"",1,0,0,"image",df3768da-31f5-4ba6-82f0-127a1a705169,"" -eba04826-62a5-48bd-876f-9119667b1487,"",1,0,0,"image",4e16e743-265a-4bf2-9fd1-57ada0b28904,"" +79034317-3beb-447e-987d-4e310a8cf410,"",1,1,0,"image",73a86d7e-93c0-480e-9c41-ab42f69b7799,"" +e35ed972-c46c-4aad-a1e7-ef103ae079a2,"",1,1,0,"image",df3768da-31f5-4ba6-82f0-127a1a705169,"" +eba04826-62a5-48bd-876f-9119667b1487,"",1,1,0,"image",4e16e743-265a-4bf2-9fd1-57ada0b28904,"" diff --git a/testutil/singlevm/tables/workload_storage.csv b/testutil/singlevm/tables/workload_storage.csv index e2e22455d..7861a6ce5 100644 --- a/testutil/singlevm/tables/workload_storage.csv +++ b/testutil/singlevm/tables/workload_storage.csv @@ -1,3 +1,3 @@ -79034317-3beb-447e-987d-4e310a8cf410,"",1,0,0,"image",73a86d7e-93c0-480e-9c41-ab42f69b7799,"" -e35ed972-c46c-4aad-a1e7-ef103ae079a2,"",1,0,0,"image",df3768da-31f5-4ba6-82f0-127a1a705169,"" -eba04826-62a5-48bd-876f-9119667b1487,"",1,0,0,"image",4e16e743-265a-4bf2-9fd1-57ada0b28904,"" +79034317-3beb-447e-987d-4e310a8cf410,"",1,1,0,"image",73a86d7e-93c0-480e-9c41-ab42f69b7799,"" +e35ed972-c46c-4aad-a1e7-ef103ae079a2,"",1,1,0,"image",df3768da-31f5-4ba6-82f0-127a1a705169,"" +eba04826-62a5-48bd-876f-9119667b1487,"",1,1,0,"image",4e16e743-265a-4bf2-9fd1-57ada0b28904,""