From 39de131064b2ed6f803a527a7ee86fcecf055aa4 Mon Sep 17 00:00:00 2001
From: YanzhaoLi <yanzhaol@vmware.com>
Date: Wed, 5 Dec 2018 00:41:15 -0800
Subject: [PATCH 1/2] Fix pre-upgrade container's updates being dropped

just test
---
 .drone.yml                                    | 35 -------------------
 .../Group11-Upgrade/11-01-Upgrade.robot       |  6 ++--
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 0681a0d38b..f8bf77972a 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -75,41 +75,6 @@ pipeline:
     when:
       status: success
 
-  vic-unit-test:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-    secrets:
-      - drone_server
-      - drone_token
-      - github_automation_api_key
-      - codecov_token
-    commands:
-      - tests/unit-test-check.sh
-    when:
-      status: success
-
-  custom-bootstrap-iso:
-    image: 'gcr.io/eminent-nation-87317/vic-build-image:yum'
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-    secrets:
-    - drone_server
-    - drone_token
-    - github_automation_api_key
-    - codecov_token
-    commands:
-    - export BUILD_NUMBER=${DRONE_BUILD_NUMBER}
-    - ./tests/generate-custom-iso.sh centos-6.9
-    when:
-      status: success
-
   vic-integration-test-on-pr:
     image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
     pull: true
diff --git a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
index 388ef822e7..5078a77a6c 100644
--- a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
+++ b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
@@ -71,9 +71,9 @@ Run Docker Checks
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
     Should Be Equal As Integers  ${rc}  0
 
-    ${status}=  Get State Of Github Issue  7534
-    Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #7534 has been resolved
-    #Should Not Contain  ${output}  Exited (0)
+    # ${status}=  Get State Of Github Issue  7534
+    # Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #7534 has been resolved
+    Should Not Contain  ${output}  Exited (0)
 
     # Check that rename works on a container from a VCH that supports rename
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}

From 53f2c24eb81d07e878216bc21d6ace78c8d39a1b Mon Sep 17 00:00:00 2001
From: YanzhaoLi <yanzhaol@vmware.com>
Date: Wed, 5 Dec 2018 01:25:35 -0800
Subject: [PATCH 2/2] fixup! Fix pre-upgrade container's updates being dropped

---
 .drone.yml                                     | 18 ++++++++++++++++++
 .../Group11-Upgrade/11-01-Upgrade.robot        |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f8bf77972a..0011e397cc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -75,6 +75,24 @@ pipeline:
     when:
       status: success
 
+  custom-bootstrap-iso:    
+    image: 'gcr.io/eminent-nation-87317/vic-build-image:yum'    
+    pull: true    
+    environment:    
+      BIN: bin    
+      GOPATH: /go    
+      SHELL: /bin/bash    
+    secrets:    
+    - drone_server    
+    - drone_token    
+    - github_automation_api_key    
+    - codecov_token    
+    commands:    
+    - export BUILD_NUMBER=${DRONE_BUILD_NUMBER}    
+    - ./tests/generate-custom-iso.sh centos-6.9    
+    when:    
+      status: success
+
   vic-integration-test-on-pr:
     image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
     pull: true
diff --git a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
index 5078a77a6c..038f190cb7 100644
--- a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
+++ b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
@@ -59,12 +59,12 @@ Run Docker Checks
     Should Be Equal As Integers  ${rc}  0
 
 
-    ${status}=  Get State Of Github Issue  5653
-    Run Keyword If  '${status}' == 'closed'  Should Contain  ${output}  Exited (143)
-    Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #5653 has been resolved
+    #${status}=  Get State Of Github Issue  5653
+    #Run Keyword If  '${status}' == 'closed'  Should Contain  ${output}  Exited (143)
+    #Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #5653 has been resolved
     # Disabling the precise check for error code until https://github.com/vmware/vic/issues/5653 is fixed - we can get rid of the
     # conditional around the exit code check once the issue is closed
-    #Should Contain  ${output}  Exited (143)
+    Should Contain  ${output}  Exited (143)
 
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start vch-restart-test1
     Should Be Equal As Integers  ${rc}  0