Merge pull request #3282 from wy65701436/cherry-pick-notary

Cherry pick notary TC change.

tests/robot-cases/Group0-BAT/BAT.robot

@@ -273,8 +273,7 @@ Test Case - Admin Push Signed Image
     ${rc}  ${output}=  Run And Return Rc And Output  docker pull hello-world:latest
     Log To Console  ${output}
 
-	Push image  ${ip}  %{HARBOR_ADMIN}  %{HARBOR_PASSWORD}  library  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/Group9-Content-trust/notary-push-image.sh
     Log To Console  ${output}
     Should Be Equal As Integers  ${rc}  0

tests/robot-cases/Group9-Content-trust/notary-push-image.sh

@@ -1,12 +1,24 @@
 #!/bin/bash
 
-docker pull tomcat
+docker pull tomcat:latest
 
 IP=`ip addr s eth0 |grep "inet "|awk '{print $2}' |awk -F "/" '{print $1}'`
+PASSHRASE='Harbor12345'
+
+echo $IP
+
 export DOCKER_CONTENT_TRUST=1
 export DOCKER_CONTENT_TRUST_SERVER=https://$IP:4443
 
-docker login -u admin -p Harbor12345 $IP
+export NOTARY_ROOT_PASSPHRASE=$PASSHRASE
+export NOTARY_TARGETS_PASSPHRASE=$PASSHRASE
+export NOTARY_SNAPSHOT_PASSPHRASE=$PASSHRASE
+export DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE=$PASSHRASE
+export DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE=$PASSHRASE
+export DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE=$PASSHRASE
+export DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE=$PASSHRASE
 
+docker login -u admin -p Harbor12345 $IP
 docker tag tomcat $IP/library/tomcat:latest
-python ./tests/robot-cases/Group9-Content-trust/notary-push-image.py
+docker push $IP/library/tomcat:latest
+