Merge branch 'master' into sophie-vicadm

vmware · Mar 2, 2017 · b43505d · b43505d
2 parents dab4040 + d08e396
commit b43505d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/lib/install/validate/update.go b/lib/install/validate/update.go
@@ -30,8 +30,15 @@ func (v *Validator) ValidateMigratedConfig(ctx context.Context, conf *config.Vir
 	v.assertTarget(conf)
 	v.assertDatastore(conf)
 	v.assertNetwork(conf)
+	if err := v.ListIssues(); err != nil {
+		return conf, err
+	}
+	return v.migrateData(ctx, conf)
+}
 
-	return conf, v.ListIssues()
+func (v *Validator) migrateData(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) (*config.VirtualContainerHostConfigSpec, error) {
+	conf.Version = version.GetBuild()
+	return conf, nil
 }
 
 func (v *Validator) assertNetwork(conf *config.VirtualContainerHostConfigSpec) {

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -39,7 +39,7 @@ var (
 const (
 	DockerAPIVersion     = "1.25"
 	DockerDefaultVersion = "1.25"
-	DockerMinimumVersion = "1.23"
+	DockerMinimumVersion = "1.19"
 )
 
 type Build struct {

diff --git a/tests/nightly/nightly-kickoff.sh b/tests/nightly/nightly-kickoff.sh
@@ -17,6 +17,7 @@
 nightly_list_var="5-1-Distributed-Switch \
 5-2-Cluster \
 5-3-Enhanced-Linked-Mode \
+5-4-High-Availability \
 5-5-Heterogenous-ESXi \
 5-6-1-VSAN-Simple \
 5-6-2-VSAN-Complex \
@@ -130,8 +131,8 @@ for i in $nightly_list_var; do
 done
 
 # Setting the NSX test status to Not Implemented.
-nightlystatus[6]="Not Implemented"
-nightlystatus[21]="Not Implemented"
+nightlystatus[7]="TODO"
+nightlystatus[23]="TODO"
 
 for i in "${nightlystatus[@]}" 
 do

diff --git a/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.robot b/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.robot
@@ -51,7 +51,7 @@ Docker1.13 Version Format Server API Version
 Docker1.13 Version Format Server Minimum API Version
     ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} version --format '{{.Server.MinAPIVersion}}'
     Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  1.23
+    Should Be Equal As Strings  ${output}  1.19
 
 Docker Version Format Server Go Version
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} version --format '{{.Server.GoVersion}}'

diff --git a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
@@ -11,7 +11,9 @@ Install VIC with version to Test Server
     Log To Console  \nDownloading vic ${version} from bintray...
     ${rc}  ${output}=  Run And Return Rc And Output  wget https://bintray.com/vmware/vic-repo/download_file?file_path=vic_${version}.tar.gz -O vic.tar.gz
     ${rc}  ${output}=  Run And Return Rc And Output  tar zxvf vic.tar.gz
+	Set Environment Variable  TEST_TIMEOUT  20m0s
 	Install VIC Appliance To Test Server  vic-machine=./vic/vic-machine-linux  appliance-iso=./vic/appliance.iso  bootstrap-iso=./vic/bootstrap.iso  certs=${false}
+    Set Environment Variable  VIC-ADMIN  %{VCH-IP}:2378
 
 Clean up VIC Appliance And Local Binary
     Cleanup VIC Appliance On Test Server
@@ -61,8 +63,11 @@ Upgrade VCH with containers
     Should Not Contain  ${output}  Rolling back upgrade
     Should Be Equal As Integers  ${rc}  0
 
+    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux version
+    @{vers}=  Split String  ${output}
     ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE}
     Should Contain  ${output}  Completed successfully
+    Should Contain  ${output}  @{vers}[2]
     Should Be Equal As Integers  ${rc}  0
     Log  ${output}
     Get Docker Params  ${output}  ${true}