Merge pull request #10514 from bitsf/cicd_smaller_image

feat(cicd) use a smaller docker image for test
This commit is contained in:
Wang Yan 2020-01-17 16:32:23 +08:00 committed by GitHub
commit 6baed99548
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions

View File

@ -39,7 +39,7 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 1 fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -93,7 +93,7 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 1 fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -147,7 +147,7 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 1 fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -201,7 +201,7 @@ jobs:
docker_channel: stable docker_channel: stable
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 1 fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |
@ -245,7 +245,7 @@ jobs:
node-version: '10.16.2' node-version: '10.16.2'
- uses: actions/checkout@v1 - uses: actions/checkout@v1
with: with:
fetch-depth: 1 fetch-depth: 2
path: src/github.com/goharbor/harbor path: src/github.com/goharbor/harbor
- name: setup env - name: setup env
run: | run: |

View File

@ -72,9 +72,9 @@ class TestProjects(unittest.TestCase):
admin_name = ADMIN_CLIENT["username"] admin_name = ADMIN_CLIENT["username"]
admin_password = ADMIN_CLIENT["password"] admin_password = ADMIN_CLIENT["password"]
user_ra_password = "Aa123456" user_ra_password = "Aa123456"
image_project_a = "tomcat" image_project_a = "haproxy"
image_project_b = "hello-world" image_project_b = "hello-world"
image_project_c = "mysql" image_project_c = "httpd"
image_robot_account = "mariadb" image_robot_account = "mariadb"
tag = "latest" tag = "latest"

View File

@ -84,7 +84,7 @@ class TestProjects(unittest.TestCase):
#Note: Please make sure that this Image has never been pulled before by any other cases, #Note: Please make sure that this Image has never been pulled before by any other cases,
# so it is a not-scanned image rigth after repository creation. # so it is a not-scanned image rigth after repository creation.
image = "mysql" image = "httpd"
src_tag = "latest" src_tag = "latest"
#3.2 push another image to project_Luca; #3.2 push another image to project_Luca;
TestProjects.repo_Luca_name, tag_Luca = push_image_to_project(project_Luca_name, harbor_server, user_Luca_name, user_common_password, image, src_tag) TestProjects.repo_Luca_name, tag_Luca = push_image_to_project(project_Luca_name, harbor_server, user_Luca_name, user_common_password, image, src_tag)