Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-01-21 07:01:25 +01:00
Code Issues Projects Releases Wiki Activity

Bump to version to v1.10.16 (#18147)

Browse Source 
Signed-off-by: Yang Jiao <jiaoya@vmware.com>
This commit is contained in:
Yang Jiao 2023-01-31 19:22:25 +08:00 committed by GitHub
parent 1569b8da67
commit bd3f62cd1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -79,7 +79,7 @@ DEVFLAG=true
NOTARYFLAG=false
CLAIRFLAG=false
HTTPPROXY=
BUILDBIN=false
BUILDBIN=true
MIGRATORFLAG=false
NPM_REGISTRY=https://registry.npmjs.org
# enable/disable chart repo supporting

2
VERSION
View File

@ -1 +1 @@
v1.10.15
v1.10.16

7
tests/apitests/python/library/repository.py
View File

@ -39,6 +39,13 @@ def push_special_image_to_project(project_name, registry, username, password, im
return
_docker_api.docker_image_build(r'{}/{}/{}'.format(registry, project_name, image), tags = tags, size=size, expected_error_message=expected_error_message)
def push_image_to_project_by_cmd(project_name, registry, username, password, image, tag, expected_login_error_message = None, expected_error_message = None):
_docker_api = DockerAPI()
ret = _docker_api.docker_image_pull(image, tag = tag)
base.run_command(["docker", "tag", "{}:{}".format(image, tag), "{}/{}/{}:{}".format(registry, project_name, image, tag)])
_docker_api.docker_login(registry, username, password, expected_error_message = expected_login_error_message)
_docker_api.docker_image_push("{}/{}/{}".format(registry, project_name, image), tag, expected_error_message = expected_error_message)
def is_repo_exist_in_project(repositories, repo_name):
result = False
for reop in repositories:

19
tests/apitests/python/test_retention.py
View File

@ -6,7 +6,7 @@ import time
from testutils import ADMIN_CLIENT
from testutils import TEARDOWN
from testutils import harbor_server
from library.repository import push_special_image_to_project
from library.repository import push_image_to_project_by_cmd
from library.retention import Retention
from library.project import Project
@ -51,13 +51,14 @@ class TestProjects(unittest.TestCase):
TestProjects.project_src_repo_id, project_src_repo_name = self.project.create_project(metadata = {"public": "false"}, **TestProjects.USER_RA_CLIENT)
# Push image test1:1.0, test1:2.0, test1:3.0,latest, test2:1.0, test2:latest, test3:1.0
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test1", ['1.0'])
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test1", ['2.0'])
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test1", ['3.0','latest'])
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test2", ['1.0'])
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test2", ['latest'])
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test3", ['1.0'])
push_special_image_to_project(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "test4", ['1.0'])
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test1", "1.0")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test1", "2.0")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test1", "3.0")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test1", "latest")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test2", "1.0")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test2", "latest")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test3", "1.0")
push_image_to_project_by_cmd(project_src_repo_name, harbor_server, user_ra_name, user_ra_password, "goharbor/test4", "1.0")
resp=self.repo.get_repository(TestProjects.project_src_repo_id, **TestProjects.USER_RA_CLIENT)
self.assertEqual(len(resp), 4)
@ -66,7 +67,7 @@ class TestProjects(unittest.TestCase):
retention_id = self.retention.create_retention_policy(TestProjects.project_src_repo_id, selector_repository="**", selector_tag="latest*", expect_status_code = 201, **TestProjects.USER_RA_CLIENT)
# Add rule
self.retention.update_retention_add_rule(retention_id,selector_repository="test3*", selector_tag="**", expect_status_code = 200, **TestProjects.USER_RA_CLIENT)
self.retention.update_retention_add_rule(retention_id,selector_repository="goharbor/test3*", selector_tag="**", expect_status_code = 200, **TestProjects.USER_RA_CLIENT)
# Dry run
self.retention.trigger_retention_policy(retention_id, dry_run=True, **TestProjects.USER_RA_CLIENT)

2
tests/ci/ut_install.sh
View File

@ -20,7 +20,7 @@ sudo -E env "PATH=$PATH" make go_check
sudo ./tests/hostcfg.sh
sudo ./tests/generateCerts.sh
sudo make build_base_images -e BASEIMAGETAG=dev
sudo make -f make/photon/Makefile _build_db _build_registry _build_prepare -e VERSIONTAG=dev -e REGISTRYVERSION=${REG_VERSION} -e BASEIMAGETAG=dev
sudo make -f make/photon/Makefile _build_db _build_registry _build_prepare -e VERSIONTAG=dev -e BASEIMAGETAG=dev -e BUILDBIN=true -e REGISTRY_SRC_TAG=v2.7.1
sudo MAKEPATH=$(pwd)/make ./make/prepare
sudo mkdir -p "/data/redis"
sudo mkdir -p /etc/core/ca/ && sudo mv ./tests/ca.crt /etc/core/ca/