diff --git a/.drone.yml b/.drone.yml index b35598483..9b0710c2d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,7 +27,7 @@ pipeline: status: success test-and-issue-build: - image: vmware/harbor-e2e-engine:1.41 + image: goharbor/harbor-e2e-engine:1.42 pull: true privileged: true environment: diff --git a/tests/integration.sh b/tests/integration.sh index 504af50a5..fe9658ed2 100755 --- a/tests/integration.sh +++ b/tests/integration.sh @@ -17,6 +17,8 @@ set -x gsutil version -l set +x +docker-compose version + ## -------------------------------------------- Pre-condition -------------------------------------------- if [[ $DRONE_REPO != "goharbor/harbor" ]]; then echo "Only run tests again Harbor Repo." diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index 4f83c066c..2307a243d 100644 --- a/tests/resources/Harbor-Util.robot +++ b/tests/resources/Harbor-Util.robot @@ -57,8 +57,8 @@ Package Harbor Offline Start Docker Daemon Locally Log To Console \n\nmake package_offline NPM_REGISTRY=%{NPM_REGISTRY} VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} UIVERSIONTAG=%{Harbor_UI_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 VERSIONTAG=%{Harbor_Assets_Version} PKGVERSIONTAG=%{Harbor_Package_Version} UIVERSIONTAG=%{Harbor_UI_Version} NOTARYFLAG=${with_notary} CLAIRFLAG=${with_clair} MIGRATORFLAG=${with_migrator} CHARTFLAG=${with_chartmuseum} HTTPPROXY= - Log ${rc} - Log ${output} + Log To Console ${rc} + Log To Console ${output} Should Be Equal As Integers ${rc} 0 Package Harbor Online