Skip to content

USHIFT-1733: 1733 reenable after cleanup #2425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-ci merged 2 commits into from
Oct 3, 2023
Merged

USHIFT-1733: 1733 reenable after cleanup #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b26eeb
re-enable microshift.service after cleanup
pmtk Sep 29, 2023
14b6751
altered to get kubeconfig after hostname change
eggfoobar Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/resources/microshift-process.resource
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ Stop MicroShift
Start MicroShift
[Documentation] Start the MicroShift service
Systemctl With Retry start microshift.service
# Kubeconfig may change between restarts, ensure we are taking the latest one.
Setup Kubeconfig

Enable MicroShift
[Documentation] Enable the MicroShift service
Expand All @@ -108,3 +110,5 @@ Cleanup MicroShift
... return_stdout=True return_stderr=True return_rc=True
Log Many ${stdout} ${stderr} ${rc}
Should Be Equal As Integers ${rc} 0

Enable MicroShift
5 changes: 3 additions & 2 deletions test/suites/greenboot/greenboot.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ Simulate Service Failure
Restart Greenboot And Wait For Success
Disrupt Service
Cleanup MicroShift --all --keep-images
# not using 'Start MicroShift' kw because it retries
Run Keyword And Expect Error 0 != 1
... Systemctl enable --now microshift
... Systemctl start microshift
Run Keyword And Expect Error 0 != 1
... Restart Greenboot And Wait For Success

Expand Down Expand Up @@ -133,6 +134,6 @@ Disrupt Pod Network
Cleanup And Start
[Documentation] Wipe Microshift data and start it.
Cleanup MicroShift --all --keep-images
Systemctl enable --now microshift
Start MicroShift
Setup Kubeconfig
Restart Greenboot And Wait For Success
3 changes: 1 addition & 2 deletions test/suites/standard/hostname.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,5 @@ Setup Hostname
IF "${hostname}"=="${EMPTY}" RETURN
${old}= Change Hostname ${hostname}
Cleanup MicroShift --all --keep-images
Systemctl enable microshift
Restart MicroShift
Start MicroShift
RETURN ${old}