Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CSAN
Csan
Commits
aa71bc46
Unverified
Commit
aa71bc46
authored
Sep 22, 2020
by
danfengliu
Committed by
GitHub
Sep 22, 2020
Browse files
Merge pull request #12911 from danfengliu/add-retry-for-cnab-push
Rerun keyword of push CNAB
parents
b9bb47ca
ef53edf5
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
49 additions
and
8 deletions
+49
-8
tests/resources/Harbor-Pages/Replication.robot
tests/resources/Harbor-Pages/Replication.robot
+1
-1
tests/resources/Helm-Util.robot
tests/resources/Helm-Util.robot
+6
-3
tests/resources/Nightly-Util.robot
tests/resources/Nightly-Util.robot
+14
-0
tests/robot-cases/Group1-Nightly/Common.robot
tests/robot-cases/Group1-Nightly/Common.robot
+1
-1
tests/robot-cases/Group1-Nightly/Setup_Nightly.robot
tests/robot-cases/Group1-Nightly/Setup_Nightly.robot
+27
-0
tests/robot-cases/Group3-Upgrade/prepare.py
tests/robot-cases/Group3-Upgrade/prepare.py
+0
-3
No files found.
tests/resources/Harbor-Pages/Replication.robot
View file @
aa71bc46
...
...
@@ -167,7 +167,7 @@ Delete Rule
Select Rule
[
Arguments
]
${rule}
Retry Element Click
//clr-dg-
row
[contains(.,'
${rule}
')]
//label
Retry
Double Keywords When Error
Retry
Element Click
//clr-dg-
cell
[contains(.,'
${rule}
')]
Retry Wait Element
${replication_exec_id}
Stop Jobs
Retry Element Click
${stop_jobs_button}
...
...
tests/resources/Helm-Util.robot
View file @
aa71bc46
...
...
@@ -18,21 +18,24 @@ Library OperatingSystem
Library
Process
*** Keywords ***
Prepare Helm Cert
Wait Unitl Command Success
cp harbor_ca.crt /ca/server.crt
Helm Repo Add
[
Arguments
]
${harbor_url}
${user}
${pwd}
${project_name}
=library
${helm_repo_name}
=myrepo
${rc}
${output}
=
Run And Return Rc And Output
helm repo remove
${project_name}
Log To Console
${output}
Wait Unitl Command Success
helm repo add --username=
${user}
--password=
${pwd}
${helm_repo_name}
${harbor_url}
/chartrepo/
${project_name}
Wait Unitl Command Success
helm repo add
--ca-file /ca/server.crt
--username=
${user}
--password=
${pwd}
${helm_repo_name}
${harbor_url}
/chartrepo/
${project_name}
Helm Repo Push
[
Arguments
]
${user}
${pwd}
${chart_filename}
${helm_repo_name}
=myrepo
${helm_cmd}
=helm
${current_dir}
=
Run
pwd
Run
cd
${current_dir}
Run
wget
${harbor_chart_file_url}
Wait Unitl Command Success
${helm_cmd}
push --username=
${user}
--password=
${pwd}
${chart_filename}
${helm_repo_name}
Wait Unitl Command Success
${helm_cmd}
push
--ca-file=/ca/server.crt
--username=
${user}
--password=
${pwd}
${chart_filename}
${helm_repo_name}
Helm Chart Push
[
Arguments
]
${ip}
${user}
${pwd}
${chart_file}
${archive}
${project}
${repo_name}
${verion}
${rc}
${output}
=
Run And Return Rc And Output
./tests/robot-cases/Group0-Util/helm_push_chart.sh
${ip}
${user}
${pwd}
${chart_file}
${archive}
${project}
${repo_name}
${verion}
Log
${output}
Should Be Equal As Integers
${rc}
0
\ No newline at end of file
Should Be Equal As Integers
${rc}
0
tests/resources/Nightly-Util.robot
View file @
aa71bc46
...
...
@@ -40,6 +40,20 @@ CA Setup
Log To Console
Prepare Docker Cert ...
Prepare Docker Cert
${ip}
Nightly Test Setup For Nightly
[
Arguments
]
${ip}
${HARBOR_PASSWORD}
${ip1}
==
${EMPTY}
Run Keyword If
'
${ip1}
' != '
${EMPTY}
'
CA setup For Nightly
${ip1}
${HARBOR_PASSWORD}
/ca/ca1.crt
Run Keyword If
'
${ip1}
' != '
${EMPTY}
'
Run
rm -rf ./harbor_ca.crt
Run Keyword
CA setup For Nightly
${ip}
${HARBOR_PASSWORD}
Run Keyword
Start Docker Daemon Locally
CA Setup For Nightly
[
Arguments
]
${ip}
${HARBOR_PASSWORD}
${cert}
=/ca/ca.crt
Run
cp
${cert}
harbor_ca.crt
Generate Certificate Authority For Chrome
${HARBOR_PASSWORD}
Prepare Docker Cert
${ip}
Prepare Helm Cert
Collect Nightly Logs
[
Arguments
]
${ip}
${SSH_PWD}
${ip1}
==
${EMPTY}
Run Keyword
Collect Logs
${ip}
${SSH_PWD}
...
...
tests/robot-cases/Group1-Nightly/Common.robot
View file @
aa71bc46
...
...
@@ -619,7 +619,7 @@ Test Case - Push CNAB Bundle and Display
Create An New Project And Go Into Project
test
${d}
${target}
=
Set Variable
${ip}
/test
${d}
/cnab
${d}
:cnab_tag
${d}
CNAB Push Bundle
${ip}
user010
Test1@34
${target}
./tests/robot-cases/Group0-Util/bundle.json
Retry Keyword N Times When Error
5
CNAB Push Bundle
${ip}
user010
Test1@34
${target}
./tests/robot-cases/Group0-Util/bundle.json
Go Into Project
test
${d}
Wait Until Page Contains
test
${d}
/cnab
${d}
...
...
tests/robot-cases/Group1-Nightly/Setup_Nightly.robot
0 → 100644
View file @
aa71bc46
// Copyright Project Harbor Authors
//
//
Licensed
under
the
Apache
License,
Version
2.0
(the
"License");
//
you
may
not
use
this
file
except
in
compliance
with
the
License.
//
You
may
obtain
a
copy
of
the
License
at
//
//
http://www.apache.org/licenses/LICENSE-2.0
//
//
Unless
required
by
applicable
law
or
agreed
to
in
writing,
software
//
distributed
under
the
License
is
distributed
on
an
"AS
IS"
BASIS,
//
WITHOUT
WARRANTIES
OR
CONDITIONS
OF
ANY
KIND,
either
express
or
implied.
//
See
the
License
for
the
specific
language
governing
permissions
and
//
limitations
under
the
License.
*** Settings ***
Documentation
Harbor BATs
Resource
../../resources/Util.robot
Default Tags
Nightly
*** Test Cases ***
Test Suites Setup For UI Test
Nightly Test Setup For Nightly
${ip}
${HARBOR_PASSWORD}
${ip1}
Setup API Test
Test Case - Get Harbor Version
#Just get harbor version and log it
Get Harbor Version
\ No newline at end of file
tests/robot-cases/Group3-Upgrade/prepare.py
View file @
aa71bc46
...
...
@@ -403,9 +403,6 @@ class HarborAPI:
pass
open
(
target
,
'wb'
).
write
(
ca_content
.
encode
(
'utf-8'
))
@
get_feature_branch
def
push_artifact
(
self
,
project
,
**
kwargs
):
def
request
(
url
,
method
,
user
=
None
,
userp
=
None
,
**
kwargs
):
if
user
is
None
:
user
=
"admin"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment