Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-03 09:09:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8380 from danfengliu/change-image-for-vulnerability-scanning

Browse Source 
Replace image from haproxy to postgres for vulnerability scanning
This commit is contained in:
Wang Yan 2019-07-25 13:58:04 +08:00 committed by GitHub
commit a2fa4cdcf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/resources/Docker-Util.robot
View File

@ -32,12 +32,14 @@ Pull image
Should Not Contain ${output} No such image: Should Not Contain ${output} No such image:
Push image Push image
[Arguments] ${ip} ${user} ${pwd} ${project} ${image} [Arguments] ${ip} ${user} ${pwd} ${project} ${image} ${sha256}=${null} ${tag}=${null}
Log To Console \nRunning docker push ${image}... ${full_image}= Set Variable If '${sha256}'=='${null}' ${image} ${image}@sha256:${sha256}
Wait Unitl Command Success docker pull ${image} ${image_with_tag}= Set Variable If '${tag}'=='${null}' ${image} ${image}:${sha256}
Log To Console \nRunning docker push ${full_image}...
Wait Unitl Command Success docker pull ${full_image}
Wait Unitl Command Success docker login -u ${user} -p ${pwd} ${ip} 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 ${full_image} ${ip}/${project}/${image_with_tag}
Wait Unitl Command Success docker push ${ip}/${project}/${image} Wait Unitl Command Success docker push ${ip}/${project}/${image_with_tag}
Wait Unitl Command Success docker logout ${ip} Wait Unitl Command Success docker logout ${ip}
Push Image With Tag Push Image With Tag
@ -55,9 +57,10 @@ Cannot Docker Login Harbor
Command Should be Failed docker login -u ${user} -p ${pwd} ${ip} Command Should be Failed docker login -u ${user} -p ${pwd} ${ip}
Cannot Pull image Cannot Pull image
[Arguments] ${ip} ${user} ${pwd} ${project} ${image} [Arguments] ${ip} ${user} ${pwd} ${project} ${image} ${tag}=${null}
${image_with_tag}= Set Variable If '${tag}'=='${null}' ${image} ${image}:${tag}
Wait Unitl Command Success docker login -u ${user} -p ${pwd} ${ip} Wait Unitl Command Success docker login -u ${user} -p ${pwd} ${ip}
Command Should be Failed docker pull ${ip}/${project}/${image} Command Should be Failed docker pull ${ip}/${project}/${image_with_tag}
Cannot Pull Unsigned Image Cannot Pull Unsigned Image
[Arguments] ${ip} ${user} ${pass} ${proj} ${imagewithtag} [Arguments] ${ip} ${user} ${pass} ${proj} ${imagewithtag}

11
tests/robot-cases/Group1-Nightly/Common.robot
View File

@ -581,6 +581,7 @@ Test Case - Retag A Image Tag
Test Case - Scan Image On Push Test Case - Scan Image On Push
Wait Unitl Vul Data Ready ${HARBOR_URL} 7200 30 Wait Unitl Vul Data Ready ${HARBOR_URL} 7200 30
Init Chrome Driver Init Chrome Driver
Push Image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} library hello-world
Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD}
Go Into Project library Go Into Project library
Goto Project Config Goto Project Config
@ -610,14 +611,16 @@ Test Case - Project Level Image Serverity Policy
Init Chrome Driver Init Chrome Driver
Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} Sign In Harbor ${HARBOR_URL} ${HARBOR_ADMIN} ${HARBOR_PASSWORD}
${d}= get current date result_format=%m%s ${d}= get current date result_format=%m%s
${sha256}= Set Variable 68b49a280d2fbe9330c0031970ebb72015e1272dfa25f0ed7557514f9e5ad7b7
${image}= Set Variable postgres
Create An New Project project${d} Create An New Project project${d}
Push Image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} project${d} haproxy Push Image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} project${d} ${image} sha256=${sha256} tag=${sha256}
Go Into Project project${d} Go Into Project project${d}
Go Into Repo haproxy Go Into Repo ${image}
Scan Repo latest Succeed Scan Repo ${sha256} Succeed
Navigate To Projects Navigate To Projects
Go Into Project project${d} Go Into Project project${d}
Set Vulnerabilty Serverity 0 Set Vulnerabilty Serverity 0
Cannot pull image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} project${d} haproxy Cannot pull image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} project${d} ${image} tag=${sha256}
Close Browser Close Browser