cd1989
92b04cffd5
Fix make prepare problem
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-09 17:02:09 +08:00
Wenkai Yin
580674f3da
Merge remote-tracking branch 'upstream/master' into 190409_sync
2019-04-09 17:01:09 +08:00
Qian Deng
fdf57f07f0
Merge pull request #7277 from ninjadq/refactor_config_file
...
Refactor config file
2019-04-09 15:48:15 +08:00
Qian Deng
deba378842
Enhance: Refacotr Registry config file
...
1. Refactor registry configs
2. cp gcs keyfile is exist
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 14:40:41 +08:00
danfengliu
7c0273e5f9
Add a checkpoint in the end of key word <Add Guest Member To Project>, to make sure that the confirm button was click successfully, to see if this confirm button was dissappered after clicked. ( #7320 )
...
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-04-09 13:41:56 +08:00
Wenkai Yin
32c6dd67af
Merge pull request #7321 from ywk253100/190409_ut
...
Add unit test cases for Harbor adapter
2019-04-09 13:41:43 +08:00
Wenkai Yin
9e5e723855
Add unit test cases for Harbor adapter
...
Add unit test cases for Harbor adapter
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-09 13:04:04 +08:00
Qian Deng
74c4e243e3
Refator the host related config
...
1. Refactor host config
2. Refactor certiface config
3. Add port config
4. Add log info config
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Qian Deng
fef7702e9a
Enhance: Refactor the config parse logic
...
Refactor the config parse logic
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Qian Deng
ac1b7bb1fb
Enhance: remove the reload key item
...
Remove the reload_config item in config file
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Qian Deng
cd65b68ab3
Enhance: Refactor the format
...
Refactor the whole structure of harbor.yml
Signed-off-by: Qian Deng <dengq@vmware.com>
2019-04-09 12:55:07 +08:00
Daniel Jiang
77ed9a871f
Update CHANGELOG.md to make it up to date ( #7315 )
...
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-04-09 12:27:47 +08:00
Wenkai Yin
855c0a2a6e
Merge pull request #7194 from stonezdj/remove_error_msg
...
Remove error message of saving system setting to db
2019-04-09 12:02:17 +08:00
danfengliu
0e0c691225
In project.robot, many element click or other action keywords missing retry, it will cause innessesary sleep in scripts. ( #7274 )
...
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-04-09 10:44:24 +08:00
jwangyangls
a8ff6aa934
Merge pull request #7317 from jwangyangls/oidcRedirectToHarbor
...
Add OIDC onboard page redirect to Harbor url when we login from OIDC
2019-04-09 10:04:35 +08:00
Wenkai Yin
d72a53aa0c
Merge pull request #7318 from ywk253100/190408_upgrade
...
Upgrade the replication_job table
2019-04-08 22:43:40 +08:00
Wenkai Yin
4ffa0c3da0
Upgrade the replication_job table
...
This commit migrates the replication_job table, add one execution record and one task record for each job
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-08 22:23:53 +08:00
stonezdj
e8ab7156bc
Remove error message of saving system setting to db
...
Signed-off-by: stonezdj <stonezdj@gmail.com>
2019-04-08 18:16:18 +08:00
Yogi_Wang
eec55f18eb
Add OIDC onboard page redirect to Harbor url when we login from OIDC and add redirect page address when we login again after logout
...
1.when we are the first time we login harbor page when we login from OIDC ,we add the url in onboard-add-username page.
2.fix the part of issue that we cannot redirect to de origin page when we login
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-08 16:30:32 +08:00
Wenkai Yin
ee6eb41dae
Merge pull request #7303 from zhoumeina/replication_ng
...
fix frontend issues
2019-04-08 15:50:21 +08:00
Wenkai Yin
7ff46acd25
Merge pull request #7289 from cd1989/add-registry-ping
...
Add registry ping API
2019-04-08 14:08:53 +08:00
cd1989
5a2d03593f
Add helth check method to registry adapter
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-08 10:03:28 +08:00
Wenkai Yin
462aab5a1e
Merge pull request #7307 from cd1989/registry-healthchecker
...
Wait randomly before registry health checking
2019-04-08 07:11:49 +08:00
cd1989
f71a110bec
Add registry ping API
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-06 17:00:52 +08:00
cd1989
07139684ce
Wait randomly before registry health checking
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-05 20:46:29 +08:00
Wenkai Yin
bfc41addb0
Merge pull request #7310 from ywk253100/190404_test
...
Upgrade the registry and replication policy tables
2019-04-05 14:04:21 +08:00
Wenkai Yin
e8fe2aa60c
Upgrade the registry and replication policy tables
...
Upgrade the registry and replication tables in database
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-05 13:25:00 +08:00
Wenkai Yin
f4bf948847
Merge pull request #7304 from cd1989/registry-delete-constraint
...
Use policy controller in registry deletion
2019-04-04 22:46:08 +08:00
cd1989
fe004e1bfc
Init replication in core
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-04 21:58:31 +08:00
cd1989
2450dacecb
Use policy controller in registry deletion
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-04 21:26:27 +08:00
Wenkai Yin
4116433de8
Merge pull request #7306 from ywk253100/190404_cleanup
...
Remove the useless replication code
2019-04-04 21:18:04 +08:00
Wenkai Yin
c2f702be2a
Remove the useless replication code
...
This commit removes the useless replication code
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 20:56:25 +08:00
Wenkai Yin
58a73de3e5
Merge pull request #7299 from ywk253100/190404_sync
...
Sync with master branch
2019-04-04 17:33:11 +08:00
Meina Zhou
0028dc0d62
fix frontend issues
...
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-04-04 17:08:59 +08:00
Wenkai Yin
dc35be09c4
Merge pull request #7301 from ywk253100/190404_agent
...
Filter the events triggerred by replication
2019-04-04 16:50:23 +08:00
Wenkai Yin
02dd4e500a
Clear up the table before doing dao test
...
Clear up the table before doing dao test
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 16:46:16 +08:00
Wenkai Yin
1c735a7464
Filter the events triggerred by replication
...
Filter the events triggerred by replication pull
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 16:03:38 +08:00
jwangyangls
ca846ad031
Merge pull request #7297 from jwangyangls/fix_oidc_ui_save
...
Fix issue of oidc configuration save button is always disabled.
2019-04-04 15:56:06 +08:00
Wenkai Yin
9db85f02d2
Merge pull request #7298 from ywk253100/190404_filter_exec_task
...
Stop a replication execution
2019-04-04 15:41:42 +08:00
Wenkai Yin
b66b1f341e
Merge remote-tracking branch 'upstream/master' into 190404_sync
2019-04-04 14:55:09 +08:00
Wenkai Yin
78fc2846bd
Stop a replication execution
...
Implement the function to support to stop the replication execution
Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-04-04 14:51:37 +08:00
Yogi_Wang
311af5d217
Fix issue of oidc configuration save button is always disabled and incorrect character
...
when we login Harbor width OIDC ,we cannot click the save button of oidc config page
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 14:34:18 +08:00
jwangyangls
a27df46fb6
Merge pull request #7292 from jwangyangls/fix_login_robot_issue
...
Fix nightly test case failed when login harbor.
2019-04-04 12:14:43 +08:00
Yogi_Wang
4416e1810e
fix login harbor issue with test case
...
Solve the problem that when we log on to the harbor page, the automation test will click on an incorrect button, which results in the test page being unable to log in.
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-04-04 09:58:46 +08:00
Wenkai Yin
3ed8d87406
Merge pull request #7294 from pureshine/replication-ui
...
Fix cannot search for replication tasks
2019-04-04 09:52:04 +08:00
Wenkai Yin
48f02d0605
Merge pull request #7291 from cd1989/registry-with-empty-credential
...
Handle registry with empty credential
2019-04-03 21:35:32 +08:00
Wenkai Yin
9e88f3d28e
Merge pull request #7290 from cd1989/edit-registry-description
...
Allow edit registry description
2019-04-03 21:09:25 +08:00
Yan
da0e20ec60
Add controller to onboard oidc user ( #7286 )
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-04-03 20:47:22 +08:00
cd1989
e2c86f8f59
Handle registry with empty credential
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-03 20:33:26 +08:00
cd1989
8968e82675
Allow edit registry description
...
Signed-off-by: cd1989 <chende@caicloud.io>
2019-04-03 19:47:14 +08:00