Skip to content

Commit

Permalink
fixup! Fix pre-upgrade container's updates being dropped
Browse files Browse the repository at this point in the history
  • Loading branch information
YanzhaoLi committed Dec 5, 2018
1 parent 39de131 commit 53f2c24
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
18 changes: 18 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 53f2c24

Please sign in to comment.