From cff4f529cd17f19ca20af3f048be355d0e5020fb Mon Sep 17 00:00:00 2001 From: danfengliu Date: Mon, 26 Oct 2020 14:58:47 +0800 Subject: [PATCH] Optimize upgrade pipeline script of push image Signed-off-by: danfengliu --- tests/robot-cases/Group1-Nightly/Common.robot | 1 + tests/robot-cases/Group3-Upgrade/prepare.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/robot-cases/Group1-Nightly/Common.robot b/tests/robot-cases/Group1-Nightly/Common.robot index 36997cc9c..2ffb5c2bc 100644 --- a/tests/robot-cases/Group1-Nightly/Common.robot +++ b/tests/robot-cases/Group1-Nightly/Common.robot @@ -694,6 +694,7 @@ Test Case - Read Only Mode Close Browser Test Case - Proxy Cache + [Tags] proxy_cache ${d}= Get Current Date result_format=%m%s ${registry}= Set Variable https://hub.docker.com/ ${user_namespace}= Set Variable danfengliu diff --git a/tests/robot-cases/Group3-Upgrade/prepare.py b/tests/robot-cases/Group3-Upgrade/prepare.py index 3e0257e42..9b8cdce85 100644 --- a/tests/robot-cases/Group3-Upgrade/prepare.py +++ b/tests/robot-cases/Group3-Upgrade/prepare.py @@ -646,8 +646,8 @@ def do_data_creation(): harborAPI.populate_projects(version=args.version) harborAPI.push_artifact_index(data["projects"][0]["name"], data["projects"][0]["artifact_index"]["name"], data["projects"][0]["artifact_index"]["tag"], version=args.version) - pull_image("busybox", "redis", "haproxy", "alpine", "httpd:2") - push_image("busybox", data["projects"][0]["name"]) + #pull_image("busybox", "redis", "haproxy", "alpine", "httpd:2") + push_image_to_project(data["projects"][0]["name"], args.endpoint, 'admin', 'Harbor12345', "busybox", "latest") push_signed_image("alpine", data["projects"][0]["name"], "latest") for replicationrule in data["replicationrule"]: