diff --git a/tests/integration.sh b/tests/integration.sh index d7c51a4651..14ad0a20b3 100755 --- a/tests/integration.sh +++ b/tests/integration.sh @@ -114,8 +114,7 @@ function uploader { function package_installer { echo "Package Harbor offline installer." - docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD - pybot --removekeywords TAG:secret --include Bundle tests/robot-cases/Group0-Distro-Harbor + pybot --removekeywords TAG:secret --include Bundle -v DOCKER_HUB_USERNAME:$DOCKER_HUB_USERNAME -v DOCKER_HUB_PASSWORD:$DOCKER_HUB_PASSWORD tests/robot-cases/Group0-Distro-Harbor harbor_offline_build_bundle=$(basename harbor-offline-installer-*.tgz) harbor_online_build_bundle=$(basename harbor-online-installer-*.tgz) upload_build=true diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index 39decbc479..1d6fbe261a 100644 --- a/tests/resources/Harbor-Util.robot +++ b/tests/resources/Harbor-Util.robot @@ -55,6 +55,7 @@ Package Harbor Offline [Arguments] ${with_notary}=true ${with_clair}=true ${with_migrator}=true ${with_chartmuseum}=true Log To Console \nStart Docker Daemon Start Docker Daemon Locally + docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD Log To Console \n\nmake package_offline BASEIMAGETAG=%{Harbor_Build_Base_Tag} NPM_REGISTRY=%{NPM_REGISTRY} VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= ${rc} ${output}= Run And Return Rc And Output make package_offline BASEIMAGETAG=%{Harbor_Build_Base_Tag} NPM_REGISTRY=%{NPM_REGISTRY} VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= Log To Console ${rc} @@ -65,6 +66,7 @@ Package Harbor Online [Arguments] ${with_notary}=true ${with_clair}=true ${with_migrator}=false ${with_chartmuseum}=true Log To Console \nStart Docker Daemon Start Docker Daemon Locally + docker login -u $DOCKER_HUB_USERNAME -p $DOCKER_HUB_PASSWORD Log To Console \nmake package_online VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= ${rc} ${output}= Run And Return Rc And Output make package_online VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= Log ${rc}