Commit Graph

686 Commits

Author SHA1 Message Date
Steven Zou
4b335b79d5
Merge pull request #9693 from steven-zou/fix/issue_#9606_update_API_swagger
update API swagger file
2019-11-06 11:06:02 +08:00
Steven Zou
0ebeaa10df update API swagger file
- add scanners mgmt related API
- add scan related API
  - trigger scan
  - get report
  - get log text stream
  - get scan all metrics
- update the scan_overview in the tag getting API
- fix #9606

Signed-off-by: Steven Zou <szou@vmware.com>
2019-11-05 22:20:14 +08:00
Wang Yan
27cb25cc04
Merge pull request #9400 from ninjadq/inject_certs_to_non_root
Inject certs to non root
2019-11-05 14:49:08 +08:00
Wang Yan
5961c4d72a
Merge pull request #9625 from ywk253100/191028_e2e
Add e2e test case for health check API
2019-11-05 14:34:36 +08:00
Wang Yan
3f39b0ba4f
Merge pull request #9550 from ninjadq/enable_https_by_default
Enable https by default
2019-11-04 16:51:33 +08:00
DQ
a0462f0baa Change the clair container to non root user
Signed-off-by: DQ <dengq@vmware.com>
2019-11-04 11:36:39 +08:00
danfengliu
e28aae0c90
Merge pull request #9685 from danfengliu/replication-dest-url-changed
Modify nightly test case due to replication rule element is modified from selector to input
2019-11-01 15:23:45 +08:00
Danfeng Liu (c)
d8c49d9834 Replication rule element is modified from selector to input, so nightly test case should be updated.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-11-01 13:08:47 +08:00
Will Sun
1c8105e837
Merge pull request #9663 from AllForNothing/nav-modify
Modify harbor-shell UI
2019-11-01 10:26:54 +08:00
sshijun
b4fa143aa4 Modify harbor-shell UI
Signed-off-by: sshijun <sshijun@vmware.com>
2019-11-01 09:31:33 +08:00
DQ
873d9f5b82 Enable https by default
1. Umcomment https related configs
2. Remove the https prepare related thing in ci

Signed-off-by: DQ <dengq@vmware.com>
2019-10-31 20:58:09 +08:00
Wang Yan
fa784d7514
Merge pull request #9649 from wy65701436/fix-9081
add ldflags for harbor compiler and linker
2019-10-31 19:14:16 +08:00
Steven Zou
7b6e83090e create API folder to keep API swagger files
- create API folder
- move harbor API swagger file to API/harbor
- add scanner adapter open API swagger file to API/scanner
- update protal build Dockerfile
- update swagger explorer build command in Makefile

Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-30 21:41:03 +08:00
wang yan
253e87d186 inject ldflags for harbor compiler and linker
1, replace the UIVERSION file with ldflags, which is generarted by make to inject into the UI core.
2, inject additional ldflags for harbor compiler

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-30 18:31:42 +08:00
Wenkai Yin
e20b538141 Add e2e test case for health check API
Add e2e test case for health check API

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2019-10-29 13:48:06 +08:00
Danfeng Liu (c)
76c5cb85ec Before user keyword Enable Self Reg, explore should be opened and navigate to harbor log in page.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-28 17:24:07 +08:00
Danfeng Liu (c)
afdf262ca6 In nightly test case of project members, xpath locator of remove a member is not strong enough for location, it used index of elemment, so it should be update by the meaning of the btn.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-28 14:52:24 +08:00
Steven Zou
5c4c04a122
Merge pull request #9602 from heww/upgrade-clair-adapter
Upgrade clair adapter to v1.0.0
2019-10-28 12:19:28 +08:00
jwangyangls
e8554b9d66
Merge pull request #9587 from jwangyangls/add-webhook-tests-1.10
Add webhook nightly case
2019-10-28 10:05:16 +08:00
He Weiwei
28e0c0693b Upgrade clair adapter to v1.0.0
1. Upgrade clair adapter to v1.0.0.
2. Make the clair adapter which installed by harbor immutable and using internal registry address.
3. Add support to build clair adapter image from binary.
4. Switch to ScannerPull action when make authorization for the scan request.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-26 17:25:36 +00:00
Yogi_Wang
988279cdcb Add webhook nightly case
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-25 15:25:32 +08:00
Ziming Zhang
7de8ce7472 add gpg sign
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I32d13be2f5b5f383113582a4b1ad5f74bdc7546b
2019-10-24 11:38:38 +08:00
jwangyangls
72776ed68c
Merge pull request #9515 from jwangyangls/fix-nightly-words
Modify the words of setting cli secret
2019-10-23 11:41:49 +08:00
wang yan
3e826c4e80 update query in the immutable delete manifest middleware
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-22 19:37:20 +08:00
Wang Yan
d503f2a245
Merge pull request #9489 from reasonerjt/bump-up-golang
Bump up golang to 1.12.12
2019-10-22 10:54:35 +08:00
Yogi_Wang
7b93e845e1 Modify the words of setting cli secret
Signed-off-by: Yogi_Wang <yawang@vmware.com>
2019-10-22 10:11:25 +08:00
Daniel Jiang
dbe6ebceec Bump up golang to 1.12.12
Bump up the golang for compiling the binaries to 1.12.12
This commit also includes some minor changes to Makefile to fix issue in
building the binary files.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-10-21 15:55:58 +08:00
Danfeng Liu (c)
7a7ac09fa0 Currently, self registration was disabled after harbor deployment, so all nightly db.robot test cases failed. To correct this, we should enable self-registration before running db test cases.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-21 14:34:34 +08:00
danfengliu
37030e513d
Merge pull request #9467 from danfengliu/modify-quota-error-msg
Fix nightly test case failure by project quota error message changed
2019-10-18 16:40:46 +08:00
wang yan
b7e336691d fix drone ci docker compose version out of date
1, update docker-compose to latest
2, print log when to package offline installer

Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-18 13:34:48 +08:00
Danfeng Liu (c)
732eda4196 Project quotas counting result is growing a little bit for unknow reason, images redis size was caculating from 25.8 to 25.9, so error message should be updated.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-18 10:30:05 +08:00
Wenkai Yin(尹文开)
97ddff2ac8
Merge pull request #9434 from heww/clair-adapter
build(clair): internal clair adapter when install with clair
2019-10-17 16:06:10 +08:00
He Weiwei
8964a8697a build(clair): internal clair adapter when install with clair
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-10-17 12:00:51 +08:00
wang yan
66e9278fef add npm registry when to build offline package in drone CI
Signed-off-by: wang yan <wangyan@vmware.com>
2019-10-16 11:59:42 +08:00
Danfeng Liu (c)
848002df83 Fix an error in prepary.py in Jenkins upgrade pipeline, which is a 'if' position error in project metadata population.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-14 18:11:17 +08:00
Steven Zou
a86afd6ebc Merge branch 'master' into feature/pluggable_scanner_s3_merge 2019-10-12 15:18:06 +08:00
Wang Yan
454a427806
Merge pull request #9239 from danfengliu/project-metadata-verification-in-upgrade-verify-script
Add project meta data verifcation In nightly migrate pipeline
2019-10-11 14:05:33 +08:00
Steven Zou
58afd8e14b [stage3] support pluggable scanner
- implement scan controller
- add scan resource and update role bindings
- update registration model and related interfaces

Signed-off-by: Steven Zou <szou@vmware.com>

- implement scan API to do scan/get report/get log
- update repository rest API to produce scan report summary
- update scan job hook handler
- update some UT cases

- update robot account making content
- hidden credential in the job log

Commnet scan related API test cases which will be re-activate later
fix #8985

fix the issues found by codacy

Signed-off-by: Steven Zou <szou@vmware.com>
2019-10-11 12:53:02 +08:00
Danfeng Liu (c)
96a271f388 In nightly migrate pipeline, after migration, should check all the data which were populated, for now, project meta data were populated, but were not been verified, so I add these verification in this PR.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-10-11 10:28:02 +08:00
danfengliu
ac0d3c991a Add nightly test case of 'Retag should be forbidden when system configuration read-only mode was set'.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-10-10 17:13:19 +08:00
danfengliu
feeb6fb2d8 1. Nightly test case failed due to more vulnerbility CVE IDs in image redis, so add 2 new CVE IDs in CVE Whitelist test cases. 2. A Keyword parameter error was fixed in this PR.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-10-02 16:43:50 +08:00
danfengliu
f6759a0353
Merge pull request #9289 from danfengliu/add-cve-for-redis
Add a new CVE ID  for image redis in nightly CVE system and project level whitelist tests
2019-09-27 22:05:25 +08:00
danfengliu
0ff1ef8766
Merge pull request #9225 from danfengliu/add-retry-for-get-project-Quotas
Add a keyword 'Retry Keyword When Return Value Mismatch'
2019-09-27 17:23:38 +08:00
danfengliu
2298b96170 In nightly CVE whitelist tests, there be a new CVE occured in image redis, so add this for test verifcation.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-27 17:20:06 +08:00
He Weiwei
4ce72e37c4 fix(robot): robot account improvement for policies
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-27 03:07:58 +00:00
Danfeng Liu (c)
20dc245631 In nightly helm pipeline, test case 'Project Quotas Control Under GC' failed, it should be timing issue that the valuse in UI is not ready, so I add a keyword 'Retry Keyword When Return Value Mismatch' to retry value getting action.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-25 17:02:05 +08:00
danfengliu
1157f129b4 After angular upgrade, in DB.robot, 4 test cases failed at create-a-new-user, the reason is that no sleep between input or click action, some blank was not inputed, so I add retry keyword for those actions.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-24 10:55:38 +08:00
danfengliu
7844ca0a2f
Merge pull request #9214 from danfengliu/add-nightly-test-case-of-retag-under-readonly-mode
Add id for system configuration repo-readonly-checkbox in UI code
2019-09-24 10:43:55 +08:00
Danfeng Liu (c)
3c8db37616 Add id for system configuration repo-readonly-checkbox in UI code, and add element locator in robot case.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-23 21:55:27 +08:00
danfengliu
cb5a145f27
Merge pull request #9212 from danfengliu/upgrade-preparev17-for-new-migrate-jenkins-pipeline-add-more-test-data
commented 2 lines to remove Vulnerability scan all data verification
2019-09-23 19:00:19 +08:00
danfengliu
7144f23857
Merge pull request #9204 from danfengliu/add-id-for-sign-up-btn
Modify sign-up button xpath from relative html path to id
2019-09-23 18:00:51 +08:00
Danfeng Liu (c)
6e4331fb92 In this PR right now, I commented 2 lines to remove a verification, it's because that Vulnerability data is not consistent when migrate harbor from 1.7 to 1.9, I've filed an issue to follow it, once it's fixed, these 2 commented lines will be come back.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-23 16:14:01 +08:00
Danfeng Liu (c)
cca1fab069 Modify sign-up button xpath from relative html path to id, and modify script.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-23 15:40:27 +08:00
Ziming
df625f4ef9
Merge pull request #9177 from bitsf/fix_tag_retention_test
adjust wait job timeout in test case
2019-09-23 14:47:05 +08:00
Danfeng Liu (c)
9a147f0999 In nightly test, keyword <Create An New Project> failed after angular upgrade, the OK button in create new project page was clicked, but it's not effective, so I add a retry for OK button click, if the button was not disappeared, script will be clicked again.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-20 16:22:10 +08:00
Ziming Zhang
afe81a8b3b adjust wait job timeout
Change-Id: I8f32f814158d4a7418c39edb7a781879db17a4d7
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-09-20 16:18:03 +08:00
Danfeng Liu (c)
9e05e6dc74 After angula upraded, all migrate pipelines failed at system setting project creation verification. Keyword of Page Should Contain is not working anymore in new UI, so I choosen a new more precise way of checking the select element value of 'everyone'
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-20 14:55:53 +08:00
Danfeng Liu (c)
5d1913842c Script test case for project quotas, there will be 2 or 3 test cases in this PR, like project quota edit, prject quota functionality.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-18 17:55:25 +08:00
jwangyangls
6dd2ae90a0
Merge pull request #9011 from jwangyangls/upgrade_clarity-2.1
Upgrade angular from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2
2019-09-18 10:45:40 +08:00
Yogi_Wang
a7c7a8e675 Upgrade angualr from 7.1.3 to 8.2.0 and clarity from 1.0 to 2.2
Signed-off-by: Yogi_Wang <yawang@vmware.com>

Signed-off-by: Meina Zhou <meinaz@vmware.com>
Signed-off-by: sshijun <sshijun@vmware.com>
2019-09-18 10:12:20 +08:00
Wang Yan
6b5fd36bb3 add e2e test case for project quota
1. Create a new user(UA);
2. Create a new private project(PA) by user(UA);
3. Add user(UA) as a member of project(PA) with project-admin role;
4. Push an image to project(PA) by user(UA), then check the project quota usage;
5. Check quota change
6. Delete image, the quota should be changed to 0.

Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-15 22:16:11 +08:00
Meina Zhou
70961ca02c upgrade node js version in ci and split the job to run frontend ut
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2019-09-11 14:55:31 +08:00
Danfeng Liu (c)
ca8590c878 Replace CVE sample image from other to redis in union, redis is stable in relative, so test result will be stable relatively
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-09 18:36:07 +08:00
jwangyangls
f200125abb
Merge pull request #8980 from danfengliu/replace-image-for-ECR-test
Replace image from tomcat to alpine for small size
2019-09-06 21:02:45 +08:00
Ziming Zhang
722e45b20b add swagger for tag retention
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I0f3ed8085e231868de74c273ba85946826181d5b
2019-09-06 17:27:20 +08:00
Danfeng Liu (c)
13af86dd85 Replace image from tomcat to alpine for small size, then it will not take a long time for replication.
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-09-06 17:26:47 +08:00
danfengliu
8539ce7b77 Add CVE whitelist project level API test into travis tests.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-05 18:02:53 +08:00
danfengliu
8503957eac 1.Add CVE white list API test into API_DB.robot;2.Random data for prject name should use lower case %m%s;3.Replace from harbor to self.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-04 15:50:09 +08:00
danfengliu
5c8890bc6d Replace image from httpd to haproxy:1.5 to make sure serverity is stable for test.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-03 14:04:59 +08:00
Wang Yan
4d5e549731
Merge pull request #8904 from danfengliu/Add-ECR-And-GCR-registry-to-nightly-replication-tests
Add AWS-ECR and Google-GCR replication test into nighly tests.
2019-09-03 13:38:57 +08:00
danfengliu
7d681c623b Add AWS-ECR and Google-GCR replication test into nighly tests.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-02 17:53:49 +08:00
Qian Deng
530240d8a3
Merge pull request #8897 from danfengliu/add-a-cve-id-to-add-system
Fix nightly case to handle new vuln found by Clair.
2019-09-02 10:10:41 +08:00
danfengliu
68fd128252 Clair scan result is not accurate that when I script this case, only 6 high CVE-ID, but in today nightly result, one more CVE-ID popuped, so I have to add it.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-30 09:55:55 +08:00
Ziming Zhang
8fb6e2f65b verify permission of GetRetentionExecTaskLog
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I4bf4ddf3d3ed6f07a4618e242e2f3774996716d6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-29 15:01:53 +08:00
danfengliu
7217ed5358 Add CVE Whitelist test cases into nightly test, first test case is system CVE Whitelist test.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-28 14:01:43 +08:00
danfengliu
841ac24ebc
Add API test case sign image back to travis, despite codacy block it when pulling a pr. (#8617)
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-19 13:35:45 +08:00
Daniel Jiang
747bf849d2
Merge pull request #8670 from reasonerjt/proj-cve-wl-apitest
API test for project level CVE whitelist
2019-08-16 18:17:26 +08:00
danfengliu
2aa6f1aed7
Merge branch 'master' into add-sign-api-back-to-travis-despite-codacy-1 2019-08-16 16:28:49 +08:00
wang yan
ddb913f8d0 Add API test case sign image back to travis, despite codacy block it when pulling a pr.
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-16 01:26:36 -07:00
Wang Yan
aab3925dab
Merge pull request #8646 from bitsf/add_harbor_test_ca
use fix root CA for test
2019-08-16 15:19:22 +08:00
Daniel Jiang
e4a78ba039 API test for project level CVE whitelist
This commit update test case to cover project level CVE whitelist.
It also fixes the swagger doc to add missing attributes

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-15 11:37:22 +08:00
stonezdj(Daojun Zhang)
032d57d8b2
Merge pull request #8656 from reasonerjt/cve_whitelist_apitest
API test for system level CVE whitelist
2019-08-14 18:26:06 +08:00
Daniel Jiang
d01597ba23 API test for system level CVE whitelist
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-08-14 14:59:58 +08:00
Ziming Zhang
2ca0b6bd1f use fix root CA for test
Change-Id: Ic663de04287d0cf963de71c3c18b43ed71f8139f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
2019-08-14 13:58:20 +08:00
danfengliu
1f53a47102
add replication testcase in api_db.robot file (#8636)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-14 10:45:20 +08:00
wang yan
76c52c2332 append commit to fix core compile error introduced by pr #8606
Signed-off-by: wang yan <wangyan@vmware.com>

Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-14 00:22:55 +08:00
wang yan
699a935c05 temporary disable result checking on coverall service in travis ci
Signed-off-by: wang yan <wangyan@vmware.com>
2019-08-13 23:29:26 +08:00
danfengliu
1b0931c034 Since harbor 1.8 released, API test for replication was not update yet, so in this PR, replicaiton test will be adapt for harbor 1.8.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-08 17:06:37 +08:00
Wang Yan
4f7e225e69
Merge pull request #8530 from danfengliu/get-ca-from-harbor-api
After helm cli test was added to nightly, ca was get by reading from …
2019-08-06 14:00:41 +08:00
danfengliu
3eeb8cf355 After helm cli test was added to nightly, ca was get by reading from local file, but in helm nighly test, ca file was not in local, it has to be got from harbor api.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-06 11:28:54 +08:00
danfengliu
6818ce9b06
Adding retry for wait element visibility, in nightly test case Developer-Operate-Labels, project didn't show up when checking its visiblity, so add some wait for this check. (#8554)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-05 16:13:39 +08:00
danfengliu
b7803571d4
Currently, nightly test pipeline was only in one level category of auth_mode and upgrade, now we like to add a level base on the original level which is harbor deployment parameters. (#8398)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-08-01 15:10:54 +08:00
danfengliu
01e3175647
In nightly test, there're some element click error occured in a rare occasion, so add a sleep to give it a try. (#8428)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-29 13:37:02 +08:00
danfengliu
a31d12e01e
modify xpath of project member due to summary tab was added in project. (#8421)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-26 17:18:47 +08:00
danfengliu
8665274406 In nighly test case <Project Level Image Serverity Policy>, scan result of haproxy image is nolonger high but medium, it should be a bug of clair, so we replace haproxy by postgres, and also we pull postgres with sha256 to make sure the image under test is alway the specific one.
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-25 10:27:10 +08:00
Wang Yan
04d63f887d
Merge pull request #8324 from ninjadq/ci_build_prepare_locally
Travis ci build prepare container in local
2019-07-18 15:14:10 +08:00
DQ
5adc29c07f Travis ci build prepare container in local
build prepare container before running ut case

Signed-off-by: DQ <dengq@vmware.com>
2019-07-18 14:46:05 +08:00
danfengliu
554b0771fe
Due to adding new feature for white list, xpath of configuration changed, it caused failure of nightly tests, so it should be fixed. (#8307)
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
2019-07-17 16:46:26 +08:00
danfengliu
9b61bf4fce
In nightly test case 'list helm chart', delete chart (#8280)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-17 15:32:10 +08:00
danfengliu
a8300d91e6
Add a nightly test case helm CLI, in this case, we verify help repo add and helm push. (#8240)
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-07-16 14:00:30 +08:00