diff --git a/tests/resources/Docker-Util.robot b/tests/resources/Docker-Util.robot index 6febee4d6..dc76ceb1b 100644 --- a/tests/resources/Docker-Util.robot +++ b/tests/resources/Docker-Util.robot @@ -40,10 +40,10 @@ Push image ${image_with_sha256}= Set Variable If '${sha256}'=='${null}' ${image} ${image}@sha256:${sha256} ${image_with_tag}= Set Variable If '${sha256}'=='${null}' ${image} ${image}:${sha256} Log To Console \nRunning docker push ${image}... - Docker Pull ${image_with_sha256} + Docker Pull ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image_with_sha256} Run Keyword If ${is_robot}==${false} Wait Unitl Command Success docker login -u ${user} -p ${pwd} ${ip} ... ELSE Wait Unitl Command Success docker login -u robot\\\$${user} -p ${pwd} ${ip} - Wait Unitl Command Success docker tag ${image_with_sha256} ${ip}/${project}/${image_with_tag} + Wait Unitl Command Success docker tag ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image_with_sha256} ${ip}/${project}/${image_with_tag} Wait Unitl Command Success docker push ${ip}/${project}/${image_with_tag} Wait Unitl Command Success docker logout ${ip} Sleep 1 @@ -52,9 +52,9 @@ Push Image With Tag #tag1 is tag of image on docker hub,default latest,use a version existing if you do not want to use latest [Arguments] ${ip} ${user} ${pwd} ${project} ${image} ${tag} ${tag1}=latest Log To Console \nRunning docker push ${image}... - Docker Pull ${image}:${tag1} + Docker Pull ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image}:${tag1} Wait Unitl Command Success docker login -u ${user} -p ${pwd} ${ip} - Wait Unitl Command Success docker tag ${image}:${tag1} ${ip}/${project}/${image}:${tag} + Wait Unitl Command Success docker tag ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image}:${tag1} ${ip}/${project}/${image}:${tag} Wait Unitl Command Success docker push ${ip}/${project}/${image}:${tag} Wait Unitl Command Success docker logout ${ip} @@ -77,9 +77,9 @@ Cannot Pull Unsigned Image Cannot Push image [Arguments] ${ip} ${user} ${pwd} ${project} ${image} ${err_msg}=${null} Log To Console \nRunning docker push ${image}... - Docker Pull ${image} + Docker Pull ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image} Wait Unitl Command Success docker login -u ${user} -p ${pwd} ${ip} - Wait Unitl Command Success docker tag ${image} ${ip}/${project}/${image} + Wait Unitl Command Success docker tag ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image} ${ip}/${project}/${image} ${output}= Command Should be Failed docker push ${ip}/${project}/${image} Run Keyword If '${err_msg}' != '${null}' Should Contain ${output} ${err_msg} Wait Unitl Command Success docker logout ${ip} diff --git a/tests/resources/TestCaseBody.robot b/tests/resources/TestCaseBody.robot index bb2eb8f6b..2e9f1ff98 100644 --- a/tests/resources/TestCaseBody.robot +++ b/tests/resources/TestCaseBody.robot @@ -101,10 +101,8 @@ Body Of Admin Push Signed Image [Arguments] ${image}=tomcat ${with_remove}=${false} Enable Notary Client - Docker Pull hello-world:latest - - Push image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} library hello-world:latest - ${rc} ${output}= Run And Return Rc And Output ./tests/robot-cases/Group0-Util/notary-push-image.sh ${ip} library ${image} latest ${notaryServerEndpoint} + Docker Pull ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image} + ${rc} ${output}= Run And Return Rc And Output ./tests/robot-cases/Group0-Util/notary-push-image.sh ${ip} library ${image} latest ${notaryServerEndpoint} ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image}:latest Log ${output} Should Be Equal As Integers ${rc} 0 diff --git a/tests/robot-cases/Group0-Util/notary-push-image.sh b/tests/robot-cases/Group0-Util/notary-push-image.sh index 679746153..f3a9366bf 100755 --- a/tests/robot-cases/Group0-Util/notary-push-image.sh +++ b/tests/robot-cases/Group0-Util/notary-push-image.sh @@ -1,10 +1,11 @@ #!/bin/bash -docker pull $3:$4 +#docker pull $3:$4 IP=$1 PASSHRASE='Harbor12345' notaryServerEndpoint=$5 +tag_src=$6 echo $IP mkdir -p /etc/docker/certs.d/$IP/ @@ -28,5 +29,5 @@ export DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE=$PASSHRASE export DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE=$PASSHRASE docker login -u admin -p Harbor12345 $IP -docker tag $3:$4 $IP/$2/$3:$4 +docker tag $tag_src $IP/$2/$3:$4 docker push $IP/$2/$3:$4 diff --git a/tests/robot-cases/Group1-Nightly/Clair.robot b/tests/robot-cases/Group1-Nightly/Clair.robot index 393073baf..a1dbaf9a3 100644 --- a/tests/robot-cases/Group1-Nightly/Clair.robot +++ b/tests/robot-cases/Group1-Nightly/Clair.robot @@ -127,7 +127,10 @@ Test Case - Project Level Image Serverity Policy Init Chrome Driver Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} ${d}= get current date result_format=%m%s - ${sha256}= Set Variable 9755880356c4ced4ff7745bafe620f0b63dd17747caedba72504ef7bac882089 + #For docker-hub registry + #${sha256}= Set Variable 9755880356c4ced4ff7745bafe620f0b63dd17747caedba72504ef7bac882089 + #For internal CPE harbor registry + ${sha256}= Set Variable 0e67625224c1da47cb3270e7a861a83e332f708d3d89dde0cbed432c94824d9a ${image}= Set Variable redis Create An New Project project${d} Push Image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} project${d} ${image} sha256=${sha256} @@ -146,7 +149,10 @@ Test Case - Verfiy System Level CVE Whitelist Init Chrome Driver ${d}= Get Current Date result_format=%m%s ${image}= Set Variable mariadb - ${sha256}= Set Variable c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d + #For docker-hub registry + #${sha256}= Set Variable c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d + #For internal CPE harbor registry + ${sha256}= Set Variable b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1 ${signin_user}= Set Variable user025 ${signin_pwd}= Set Variable Test1@34 Sign In Harbor ${HARBOR_URL} ${signin_user} ${signin_pwd} @@ -175,7 +181,10 @@ Test Case - Verfiy Project Level CVE Whitelist Init Chrome Driver ${d}= Get Current Date result_format=%m%s ${image}= Set Variable mariadb - ${sha256}= Set Variable c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d + #For docker-hub registry + #${sha256}= Set Variable c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d + #For internal CPE harbor registry + ${sha256}= Set Variable b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1 ${signin_user}= Set Variable user025 ${signin_pwd}= Set Variable Test1@34 Sign In Harbor ${HARBOR_URL} ${signin_user} ${signin_pwd} @@ -202,7 +211,10 @@ Test Case - Verfiy Project Level CVE Whitelist By Quick Way of Add System Init Chrome Driver ${d}= Get Current Date result_format=%m%s ${image}= Set Variable mariadb - ${sha256}= Set Variable c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d + #For docker-hub registry + #${sha256}= Set Variable c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d + #For internal CPE harbor registry + ${sha256}= Set Variable b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1 ${signin_user}= Set Variable user025 ${signin_pwd}= Set Variable Test1@34 Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} diff --git a/tests/robot-cases/Group1-Nightly/Common.robot b/tests/robot-cases/Group1-Nightly/Common.robot index d9b108d1c..6acfb8d3f 100644 --- a/tests/robot-cases/Group1-Nightly/Common.robot +++ b/tests/robot-cases/Group1-Nightly/Common.robot @@ -454,7 +454,11 @@ Test Case - Project Image And Chart Artifact Count Quotas Dispaly And Control ${storage_quota}= Set Variable 500 ${storage_quota_unit}= Set Variable MB ${image}= Set Variable redis - ${sha256}= Set Variable 9755880356c4ced4ff7745bafe620f0b63dd17747caedba72504ef7bac882089 + #For docker-hub registry + #${sha256}= Set Variable 9755880356c4ced4ff7745bafe620f0b63dd17747caedba72504ef7bac882089 + #For internal CPE harbor registry + ${sha256}= Set Variable 0e67625224c1da47cb3270e7a861a83e332f708d3d89dde0cbed432c94824d9a + ${image_size}= Set Variable 34.14MB Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} Create An New Project project${d} count_quota=${count_quota} storage_quota=${storage_quota} storage_quota_unit=${storage_quota_unit} @@ -482,8 +486,8 @@ Test Case - Project Storage Quotas Dispaly And Control ${d}= Get Current Date result_format=%m%s ${storage_quota}= Set Variable 330 ${storage_quota_unit}= Set Variable MB - ${image_a}= Set Variable ${LOCAL_REGISTRY}/harbor-ci/redis - ${image_b}= Set Variable ${LOCAL_REGISTRY}/harbor-ci/logstash + ${image_a}= Set Variable redis + ${image_b}= Set Variable logstash ${image_a_size}= Set Variable 34.15MB ${image_b_size}= Set Variable 321.03MB ${image_a_ver}= Set Variable donotremove5.0 diff --git a/tests/robot-cases/Group1-Nightly/Notary.robot b/tests/robot-cases/Group1-Nightly/Notary.robot index a2b310f7c..ab210454f 100644 --- a/tests/robot-cases/Group1-Nightly/Notary.robot +++ b/tests/robot-cases/Group1-Nightly/Notary.robot @@ -43,4 +43,4 @@ Test Case - Admin Push Signed Image Body Of Admin Push Signed Image Test Case - Admin Push Signed Image And Remove Signature - Body Of Admin Push Signed Image image=mariadb with_remove=${true} \ No newline at end of file + Body Of Admin Push Signed Image image=mariadb with_remove=${true}