Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-23 00:57:44 +01:00
Code Issues Projects Releases Wiki Activity

Due to domain name was changed to legal valid one with a slash and sub directory, the name of directory for CA notary client is wrong, so it's need to be modified. (#7169)

Browse Source 
Signed-off-by: danfengliu <danfengl@vmware.com>
This commit is contained in:
danfengliu 2019-03-20 11:28:57 +08:00 committed by GitHub
parent 08c20c5ca5
commit cd33d312fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/resources/Harbor-Util.robot
View File

@ -73,7 +73,7 @@ Package Harbor Online
Log ${rc} Log ${rc}
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
Switch To LDAP Switch To LDAP
Down Harbor Down Harbor
${rc} ${output}= Run And Return Rc And Output rm -rf /data ${rc} ${output}= Run And Return Rc And Output rm -rf /data
@ -92,27 +92,29 @@ Switch To LDAP
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
${rc} ${output}= Run And Return Rc And Output docker ps ${rc} ${output}= Run And Return Rc And Output docker ps
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
Generate Certificate Authority For Chrome Generate Certificate Authority For Chrome
Enable Notary Client Enable Notary Client
${rc} ${output}= Run And Return Rc And Output rm -rf ~/.docker/ ${rc} ${output}= Run And Return Rc And Output rm -rf ~/.docker/
Log ${rc} Log ${rc}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
Log ${ip} Log ${ip}
Log To Console ${ip}
${rc}= Run And Return Rc mkdir -p /etc/docker/certs.d/${ip}/ ${rc}= Run And Return Rc mkdir -p /etc/docker/certs.d/${ip}/
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
${rc}= Run And Return Rc mkdir -p ~/.docker/tls/${notaryServerEndpoint}/ Log To Console ${notaryServerEndpointNoSubDir}
${rc}= Run And Return Rc mkdir -p ~/.docker/tls/${notaryServerEndpointNoSubDir}/
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt /etc/docker/certs.d/${ip}/ ${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt /etc/docker/certs.d/${ip}/
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt ~/.docker/tls/${notaryServerEndpoint}/ ${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt ~/.docker/tls/${notaryServerEndpointNoSubDir}/
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
${rc} ${output}= Run And Return Rc And Output ls -la /etc/docker/certs.d/${ip}/ ${rc} ${output}= Run And Return Rc And Output ls -la /etc/docker/certs.d/${ip}/
Log ${output} Log ${output}
${rc} ${output}= Run And Return Rc And Output ls -la ~/.docker/tls/${notaryServerEndpoint}/ ${rc} ${output}= Run And Return Rc And Output ls -la ~/.docker/tls/${notaryServerEndpointNoSubDir}/
Log ${output} Log ${output}
Prepare Prepare
@ -136,7 +138,7 @@ Config Harbor cfg
Log ${rc} Log ${rc}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
${out}= Run cat ./make/harbor.cfg ${out}= Run cat ./make/harbor.cfg
Log ${out} Log ${out}
Prepare Cert Prepare Cert
# Will change the IP and Protocol in the harbor.cfg # Will change the IP and Protocol in the harbor.cfg
@ -145,7 +147,7 @@ Prepare Cert
${rc}= Run And Return Rc sed "s/^IP=.*/IP=${ip}/g" -i ./tests/generateCerts.sh ${rc}= Run And Return Rc sed "s/^IP=.*/IP=${ip}/g" -i ./tests/generateCerts.sh
Log ${rc} Log ${rc}
${out}= Run cat ./tests/generateCerts.sh ${out}= Run cat ./tests/generateCerts.sh
Log ${out} Log ${out}
${rc} ${output}= Run And Return Rc And Output ./tests/generateCerts.sh ${rc} ${output}= Run And Return Rc And Output ./tests/generateCerts.sh
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
@ -158,7 +160,7 @@ Compile and Up Harbor With Source Code
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0
Sleep 20 Sleep 20
Wait for Harbor Ready Wait for Harbor Ready
[Arguments] ${protocol} ${HARBOR_IP} [Arguments] ${protocol} ${HARBOR_IP}
Log To Console Waiting for Harbor to Come Up... Log To Console Waiting for Harbor to Come Up...