Skip to content

Commit 53f2c24

Browse files
committed
fixup! Fix pre-upgrade container's updates being dropped
1 parent 39de131 commit 53f2c24

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

.drone.yml

+18
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,24 @@ pipeline:
7575
when:
7676
status: success
7777

78+
custom-bootstrap-iso:
79+
image: 'gcr.io/eminent-nation-87317/vic-build-image:yum'
80+
pull: true
81+
environment:
82+
BIN: bin
83+
GOPATH: /go
84+
SHELL: /bin/bash
85+
secrets:
86+
- drone_server
87+
- drone_token
88+
- github_automation_api_key
89+
- codecov_token
90+
commands:
91+
- export BUILD_NUMBER=${DRONE_BUILD_NUMBER}
92+
- ./tests/generate-custom-iso.sh centos-6.9
93+
when:
94+
status: success
95+
7896
vic-integration-test-on-pr:
7997
image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
8098
pull: true

tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ Run Docker Checks
5959
Should Be Equal As Integers ${rc} 0
6060

6161

62-
${status}= Get State Of Github Issue 5653
63-
Run Keyword If '${status}' == 'closed' Should Contain ${output} Exited (143)
64-
Run Keyword If '${status}' == 'closed' Fail Exit code check below needs to be updated now that Issue #5653 has been resolved
62+
#${status}= Get State Of Github Issue 5653
63+
#Run Keyword If '${status}' == 'closed' Should Contain ${output} Exited (143)
64+
#Run Keyword If '${status}' == 'closed' Fail Exit code check below needs to be updated now that Issue #5653 has been resolved
6565
# Disabling the precise check for error code until https://github.com/vmware/vic/issues/5653 is fixed - we can get rid of the
6666
# conditional around the exit code check once the issue is closed
67-
#Should Contain ${output} Exited (143)
67+
Should Contain ${output} Exited (143)
6868

6969
${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} start vch-restart-test1
7070
Should Be Equal As Integers ${rc} 0

0 commit comments

Comments
 (0)