From ef330f794bf330abe54a04a96a5237328136aed9 Mon Sep 17 00:00:00 2001 From: wang yan Date: Fri, 22 Nov 2019 14:03:03 +0800 Subject: [PATCH] udpate base image to 1.10.0 Signed-off-by: wang yan --- tests/integration.sh | 8 ++++++++ tests/resources/Harbor-Util.robot | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/integration.sh b/tests/integration.sh index 6abf1d2df..1a243c0f7 100755 --- a/tests/integration.sh +++ b/tests/integration.sh @@ -93,6 +93,14 @@ export Harbor_Assets_Version=$Harbor_Assets_Version export Harbor_Package_Version=$Harbor_Package_Version export NPM_REGISTRY=$NPM_REGISTRY +# release branch must have their own base image with branch name, master and others will use the dev as base. +if [[ $DRONE_BRANCH == "release-"* ]]; then + Harbor_Build_Base_Tag=$DRONE_BRANCH +else + Harbor_Build_Base_Tag=dev +fi +export Harbor_Build_Base_Tag=Harbor_Build_Base_Tag + echo "--------------------------------------------------" echo "Harbor Package version: $Harbor_Package_Version" echo "Harbor Assets version: $Harbor_Assets_Version" diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index f3d74c8bf..fbb9f32df 100644 --- a/tests/resources/Harbor-Util.robot +++ b/tests/resources/Harbor-Util.robot @@ -55,7 +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 - Log To Console \n\nmake package_offline 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 \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 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} Log To Console ${output}