From 84ece2e63643bf8699ce075f43c3b35769fdd702 Mon Sep 17 00:00:00 2001 From: singhshweta Date: Fri, 25 May 2018 12:20:13 -0700 Subject: [PATCH 1/2] fix 21-1-Whitelist test --- .../manual-test-cases/Group21-Registries/21-1-Whitelist.robot | 2 ++ tests/resources/Harbor-Util.robot | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot b/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot index da714f460a..5a76600785 100644 --- a/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot +++ b/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot @@ -42,9 +42,11 @@ Setup Harbor Simple ESXi Setup # Install a Harbor server with HTTPS a Harbor server with HTTP + Run Keyword and Ignore Error Remove File ${HARBOR_VERSION}.ova Install Harbor To Test Server protocol=https name=harbor-https Set Environment Variable HTTPS_HARBOR_IP %{HARBOR-IP} + Run Keyword and Ignore Error Remove File ${HARBOR_VERSION}.ova Install Harbor To Test Server protocol=http name=harbor-http Set Environment Variable HTTP_HARBOR_IP %{HARBOR-IP} diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index d9e7d38b74..5946fb3889 100644 --- a/tests/resources/Harbor-Util.robot +++ b/tests/resources/Harbor-Util.robot @@ -36,7 +36,9 @@ 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 + ${rc} ${output}= Run Keyword If '${status}' == 'FAIL' Run And Return Rc And Output wget https://github.com/vmware/harbor/releases/download/${HARBOR_SHORT_VERSION}/${HARBOR_VERSION}.ova + Log ${output} + Should Be Equal As Integers ${rc} 0 ${status} ${message}= Run Keyword And Ignore Error Environment Variable Should Be Set DRONE_BUILD_NUMBER Run Keyword If '${status}' == 'FAIL' Set Environment Variable DRONE_BUILD_NUMBER 0 @{URLs}= Split String %{TEST_URL_ARRAY} From 48f324c4bf86fe9680e824f0d9f530b475c68069 Mon Sep 17 00:00:00 2001 From: singhshweta Date: Tue, 29 May 2018 11:28:01 -0700 Subject: [PATCH 2/2] fix based on review --- tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot b/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot index 5a76600785..b7ce2bb732 100644 --- a/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot +++ b/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot @@ -46,7 +46,6 @@ Setup Harbor Install Harbor To Test Server protocol=https name=harbor-https Set Environment Variable HTTPS_HARBOR_IP %{HARBOR-IP} - Run Keyword and Ignore Error Remove File ${HARBOR_VERSION}.ova Install Harbor To Test Server protocol=http name=harbor-http Set Environment Variable HTTP_HARBOR_IP %{HARBOR-IP}