Skip to content

Refactor Install Harbor To Test Server keyword #7335

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
zjs merged 3 commits into from
Feb 20, 2018
Merged

Refactor Install Harbor To Test Server keyword #7335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b59c099
Refactor Install Harbor To Test Server keyword
zjs Feb 15, 2018
97ae4b5
fixup! Refactor Install Harbor To Test Server keyword
zjs Feb 15, 2018
a778cc8
Merge branch 'master' into issue/7249
zjs Feb 20, 2018
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
12 changes: 9 additions & 3 deletions tests/resources/Harbor-Util.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@ ${harbor_cert} getcert
${ova_harbor_admin_password} harbor-admin-passwd

*** Keywords ***
Install Harbor To Test Server
Secret Install Harbor To Test Server
[Tags] secret
[Arguments] ${name}=harbor ${protocol}=http ${verify}=off ${db_password}=%{TEST_PASSWORD} ${user}=%{TEST_USERNAME} ${password}=%{TEST_PASSWORD} ${host}=%{TEST_URL_ARRAY} ${datastore}=%{TEST_DATASTORE} ${network}=VM Network
[Arguments] ${name} ${protocol} ${verify} ${host} ${datastore} ${network}
${out}= Run ovftool --noSSLVerify --acceptAllEulas --datastore=${datastore} --name=${name} --net:"Network 1"='${network}' --diskMode=thin --powerOn --X:waitForIp --X:injectOvfEnv --X:enableHiddenProperties --prop:root_pwd=%{TEST_PASSWORD} --prop:harbor_admin_password=%{TEST_PASSWORD} --prop:db_password=%{TEST_PASSWORD} --prop:auth_mode=db_auth --prop:verify_remote_cert=${verify} --prop:protocol=${protocol} ${HARBOR_VERSION}.ova 'vi://%{TEST_USERNAME}:%{TEST_PASSWORD}@${host}'
[Return] ${out}

Install Harbor To Test Server
[Arguments] ${name}=harbor ${protocol}=http ${verify}=off ${host}=%{TEST_URL_ARRAY} ${datastore}=%{TEST_DATASTORE} ${network}=VM Network
Log To Console \nFetching harbor ova...
${status} ${message}= Run Keyword And Ignore Error OperatingSystem.File Should Exist ${HARBOR_VERSION}.ova
${out}= Run Keyword If '${status}' == 'FAIL' Run wget https://github.com/vmware/harbor/releases/download/${HARBOR_SHORT_VERSION}/${HARBOR_VERSION}.ova
Expand All @@ -42,7 +47,8 @@ Install Harbor To Test Server
${rc} ${output}= Run Keyword If '%{HOST_TYPE}' == 'VC' Set Suite Variable ${host} @{URLs}[${IDX}]%{TEST_DATACENTER}/host/%{TEST_RESOURCE}

Log To Console \nDeploying ova...
${out}= Run ovftool --noSSLVerify --acceptAllEulas --datastore=${datastore} --name=${name} --net:"Network 1"='${network}' --diskMode=thin --powerOn --X:waitForIp --X:injectOvfEnv --X:enableHiddenProperties --prop:root_pwd=${password} --prop:harbor_admin_password=${password} --prop:db_password=${db_password} --prop:auth_mode=db_auth --prop:verify_remote_cert=${verify} --prop:protocol=${protocol} ${HARBOR_VERSION}.ova 'vi://${user}:${password}@${host}'
${out}= Secret Install Harbor To Test Server ${name} ${protocol} ${verify} ${host} ${datastore} ${network}
Copy link
Contributor

@mhagen-vmware mhagen-vmware Feb 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to actually get this output for debugging purposes, I would Log ${out} before you hit the first should contain

Log ${out}
Should Contain ${out} Received IP address:
Should Not Contain ${out} None

Expand Down