diff --git a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html b/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
index f72e683d1..c829ad8bd 100644
--- a/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
+++ b/src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.html
@@ -149,7 +149,7 @@
             <clr-dg-column class="flex-max-width">{{'REPOSITORY.ARTIFACTS_COUNT' | translate}}
             </clr-dg-column>
             <clr-dg-column *ngIf="depth">{{'REPOSITORY.PLATFORM' | translate}}</clr-dg-column>
-            <clr-dg-column class="w-rem-4">{{'REPOSITORY.TAGS_COUNT' | translate}}</clr-dg-column>
+            <clr-dg-column class="w-rem-4">{{'REPOSITORY.TAGS' | translate}}</clr-dg-column>
             <clr-dg-column >{{'REPOSITORY.SIZE' | translate}}</clr-dg-column>
             <clr-dg-column>{{'REPOSITORY.VULNERABILITY' | translate}}</clr-dg-column>
             <clr-dg-column>{{'ARTIFACT.ANNOTATION' | translate}}</clr-dg-column>
@@ -207,7 +207,7 @@
                                     <thead class="tag-thead">
                                         <tr>
                                             <th class="left tag-header-color">
-                                                {{'REPOSITORY.TAGS_COUNT' | translate | uppercase}}</th>
+                                                {{'REPOSITORY.TAGS' | translate | uppercase}}</th>
                                             <th class="left tag-header-color">
                                                     {{'REPOSITORY.SIGNED' | translate | uppercase}}</th>
                                             <th class="left tag-header-color">
diff --git a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html b/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html
index 6e2ed2198..c0a5107cf 100644
--- a/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html
+++ b/src/portal/src/app/project/repository/artifact/artifact-tag/artifact-tag.component.html
@@ -1,4 +1,4 @@
-<h4>{{'REPOSITORY.TAGS_COUNT' | translate}}</h4>
+<h4>{{'REPOSITORY.TAGS' | translate}}</h4>
 
 <clr-datagrid [clrDgLoading]="loading" (clrDgRefresh)="getCurrentArtifactTags($event)"  [(clrDgSelected)]="selectedRow" [clrDgRowSelection]="true">
     <clr-dg-action-bar>
diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json
index 4a7d2a9a7..312d60271 100644
--- a/src/portal/src/i18n/lang/en-us-lang.json
+++ b/src/portal/src/i18n/lang/en-us-lang.json
@@ -640,7 +640,7 @@
         "COPY_DIGEST_ID": "Copy Digest",
         "DELETE": "Delete",
         "NAME": "Name",
-        "TAGS_COUNT": "Tags",
+        "TAGS": "Tags",
         "PLATFORM": "OS/ARCH",
         "ARTIFACT_TOOTIP": "Click this icon to enter the Artifact list of refer",
         "ARTIFACTS_COUNT": "Artifacts",
diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json
index 0c986b5e0..5436e9b8d 100644
--- a/src/portal/src/i18n/lang/es-es-lang.json
+++ b/src/portal/src/i18n/lang/es-es-lang.json
@@ -641,7 +641,7 @@
         "COPY_DIGEST_ID": "Copy Digest",
         "DELETE": "Eliminar",
         "NAME": "Nombre",
-        "TAGS_COUNT": "Etiquetas",
+        "TAGS": "Etiquetas",
         "PLATFORM": "OS/ARCH",
         "ARTIFACT_TOOTIP": "Click this icon to enter the Artifact list of refer",
         "ARTIFACTS_COUNT": "Artifacts",
diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json
index 2aeea012f..a7a6acad8 100644
--- a/src/portal/src/i18n/lang/fr-fr-lang.json
+++ b/src/portal/src/i18n/lang/fr-fr-lang.json
@@ -629,7 +629,7 @@
         "COPY_DIGEST_ID": "Copier le Résumé",
         "DELETE": "Supprimer",
         "NAME": "Nom",
-        "TAGS_COUNT": "Tags",
+        "TAGS": "Tags",
         "PLATFORM": "OS/ARCH",
         "ARTIFACT_TOOTIP": "Click this icon to enter the Artifact list of refer",
         "ARTIFACTS_COUNT": "Artifacts",
diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json
index d7e82b336..03fa5ab3c 100644
--- a/src/portal/src/i18n/lang/pt-br-lang.json
+++ b/src/portal/src/i18n/lang/pt-br-lang.json
@@ -640,7 +640,7 @@
         "COPY_DIGEST_ID": "Copiar Digest",
         "DELETE": "Remover",
         "NAME": "Nome",
-        "TAGS_COUNT": "Tags",
+        "TAGS": "Tags",
         "PLATFORM": "OS/ARCH",
         "ARTIFACT_TOOTIP": "Click this icon to enter the Artifact list of refer",
         "ARTIFACTS_COUNT": "Artifacts",
diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json
index 50e16052e..63a76ae4d 100644
--- a/src/portal/src/i18n/lang/tr-tr-lang.json
+++ b/src/portal/src/i18n/lang/tr-tr-lang.json
@@ -640,7 +640,7 @@
         "COPY_DIGEST_ID": "Özet Kopyala",
         "DELETE": "Sil",
         "NAME": "İsim",
-        "TAGS_COUNT": "Etiketler",
+        "TAGS": "Etiketler",
         "PLATFORM": "OS/ARCH",
         "ARTIFACT_TOOTIP": "Click this icon to enter the Artifact list of refer",
         "ARTIFACTS_COUNT": "Artifacts",
diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json
index 0facba9fd..0745efadd 100644
--- a/src/portal/src/i18n/lang/zh-cn-lang.json
+++ b/src/portal/src/i18n/lang/zh-cn-lang.json
@@ -641,7 +641,7 @@
         "COPY_DIGEST_ID": "复制摘要",
         "DELETE": "删除",
         "NAME": "名称",
-        "TAGS_COUNT": "Tag 数量",
+        "TAGS": "Tags",
         "PLATFORM": "OS/ARCH",
         "ARTIFACT_TOOTIP": "Click this icon to enter the Artifact list of refer",
         "ARTIFACTS_COUNT": "Artifacts",
diff --git a/tests/resources/TestCaseBody.robot b/tests/resources/TestCaseBody.robot
index 6dea8b9ff..194970f32 100644
--- a/tests/resources/TestCaseBody.robot
+++ b/tests/resources/TestCaseBody.robot
@@ -183,3 +183,96 @@ Helm3 CLI Push Without Sign In Harbor
     Switch To Project Charts
     Retry Double Keywords When Error  Go Into Chart Version  ${harbor_chart_name}  Retry Wait Until Page Contains  ${harbor_chart_version}
     Capture Page Screenshot
+
+#Important Note: All CVE IDs in CVE Whitelist cases must unique!
+Body Of Verfiy System Level CVE Whitelist
+    [Arguments]  ${image_argument}  ${sha256_argument}  ${most_cve_list}  ${single_cve}
+    [Tags]  run-once
+    Init Chrome Driver
+    ${d}=    Get Current Date    result_format=%m%s
+    ${image}=    Set Variable    ${image_argument}
+    # ${image}=    Set Variable    goharbor/harbor-portal
+    ${sha256}=  Set Variable  ${sha256_argument}
+    # ${sha256}=  Set Variable  2cb6a1c24dd6b88f11fd44ccc6560cb7be969f8ac5f752802c99cae6bcd592bb
+    ${signin_user}=    Set Variable  user025
+    ${signin_pwd}=    Set Variable  Test1@34
+    Sign In Harbor    ${HARBOR_URL}    ${signin_user}    ${signin_pwd}
+    Create An New Project    project${d}
+    Push Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    sha256=${sha256}
+    Go Into Project  project${d}
+    Set Vulnerabilty Serverity  2
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Go Into Project  project${d}
+    Go Into Repo  project${d}/${image}
+    Scan Repo  ${sha256}  Succeed
+    Logout Harbor
+    Sign In Harbor    ${HARBOR_URL}    ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
+    Switch To Configure
+    Switch To Configuration System Setting
+    # Add Items To System CVE Whitelist    CVE-2019-19317\nCVE-2019-19646 \nCVE-2019-5188 \nCVE-2019-20387 \nCVE-2019-17498 \nCVE-2019-20372 \nCVE-2019-19244 \nCVE-2019-19603 \nCVE-2019-19880 \nCVE-2019-19923 \nCVE-2019-19925 \nCVE-2019-19926 \nCVE-2019-19959 \nCVE-2019-20218 \nCVE-2019-19232 \nCVE-2019-19234 \nCVE-2019-19645
+    Add Items To System CVE Whitelist    ${most_cve_list}
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    # Add Items To System CVE Whitelist    CVE-2019-18276
+    Add Items To System CVE Whitelist    ${single_cve}
+    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Delete Top Item In System CVE Whitelist  count=6
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Close Browser
+
+Body Of Verfiy Project Level CVE Whitelist
+    [Arguments]  ${image_argument}  ${sha256_argument}  ${most_cve_list}  ${single_cve}
+    [Tags]  run-once
+    Init Chrome Driver
+    ${d}=    Get Current Date    result_format=%m%s
+    ${image}=    Set Variable    ${image_argument}
+    ${sha256}=  Set Variable  ${sha256_argument}
+    ${signin_user}=    Set Variable  user025
+    ${signin_pwd}=    Set Variable  Test1@34
+    Sign In Harbor    ${HARBOR_URL}    ${signin_user}    ${signin_pwd}
+    Create An New Project    project${d}
+    Push Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    sha256=${sha256}
+    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Go Into Project  project${d}
+    Set Vulnerabilty Serverity  2
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Go Into Project  project${d}
+    Go Into Repo  project${d}/${image}
+    Scan Repo  ${sha256}  Succeed
+    Go Into Project  project${d}
+    Add Items to Project CVE Whitelist    ${most_cve_list}
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Add Items to Project CVE Whitelist    ${single_cve}
+    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Delete Top Item In Project CVE Whitelist
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Close Browser
+
+Body Of Verfiy Project Level CVE Whitelist By Quick Way of Add System
+    [Arguments]  ${image_argument}  ${sha256_argument}  ${cve_list}
+    [Tags]  run-once
+    Init Chrome Driver
+    ${d}=    Get Current Date    result_format=%m%s
+    ${image}=    Set Variable    ${image_argument}
+    ${sha256}=  Set Variable  ${sha256_argument}
+    ${signin_user}=    Set Variable  user025
+    ${signin_pwd}=    Set Variable  Test1@34
+    Sign In Harbor    ${HARBOR_URL}    ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
+    Switch To Configure
+    Switch To Configuration System Setting
+    Add Items To System CVE Whitelist    ${cve_list}
+    Logout Harbor
+    Sign In Harbor    ${HARBOR_URL}    ${signin_user}    ${signin_pwd}
+    Create An New Project    project${d}
+    Push Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    sha256=${sha256}
+    Go Into Project  project${d}
+    Set Vulnerabilty Serverity  2
+    Go Into Project  project${d}
+    Go Into Repo  project${d}/${image}
+    Scan Repo  ${sha256}  Succeed
+    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Go Into Project  project${d}
+    Set Project To Project Level CVE Whitelist
+    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Add System CVE Whitelist to Project CVE Whitelist By Add System Button Click
+    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
+    Close Browser
\ No newline at end of file
diff --git a/tests/robot-cases/Group1-Nightly/Clair.robot b/tests/robot-cases/Group1-Nightly/Clair.robot
index a1dbaf9a3..0ac085e91 100644
--- a/tests/robot-cases/Group1-Nightly/Clair.robot
+++ b/tests/robot-cases/Group1-Nightly/Clair.robot
@@ -145,95 +145,10 @@ Test Case - Project Level Image Serverity Policy
 
 #Important Note: All CVE IDs in CVE Whitelist cases must unique!
 Test Case - Verfiy System Level CVE Whitelist
-    [Tags]  run-once
-    Init Chrome Driver
-    ${d}=    Get Current Date    result_format=%m%s
-    ${image}=    Set Variable    mariadb
-    #For docker-hub registry
-    #${sha256}=  Set Variable  c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d
-    #For internal CPE harbor registry
-    ${sha256}=  Set Variable  b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1
-    ${signin_user}=    Set Variable  user025
-    ${signin_pwd}=    Set Variable  Test1@34
-    Sign In Harbor    ${HARBOR_URL}    ${signin_user}    ${signin_pwd}
-    Create An New Project    project${d}
-    Push Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    sha256=${sha256}
-    Go Into Project  project${d}
-    Set Vulnerabilty Serverity  2
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Go Into Project  project${d}
-    Go Into Repo  project${d}/${image}
-    Scan Repo  ${sha256}  Succeed
-    Logout Harbor
-    Sign In Harbor    ${HARBOR_URL}    ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
-    Switch To Configure
-    Switch To Configuration System Setting
-    Add Items To System CVE Whitelist    CVE-2019-13050\nCVE-2018-19591\nCVE-2018-11236\nCVE-2018-11237\nCVE-2019-13627\nCVE-2018-20839\nCVE-2019-2923\nCVE-2019-2922\nCVE-2019-2911\nCVE-2019-2914\nCVE-2019-2924\nCVE-2019-2910\nCVE-2019-2938\nCVE-2019-2993\nCVE-2019-2974\nCVE-2019-2960\nCVE-2019-2948\nCVE-2019-2946
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Add Items To System CVE Whitelist    CVE-2019-2969
-    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Delete Top Item In System CVE Whitelist  count=6
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Close Browser
+    Body Of Verfiy System Level CVE Whitelist  mariadb  b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1  CVE-2019-13050\nCVE-2018-19591\nCVE-2018-11236\nCVE-2018-11237\nCVE-2019-13627\nCVE-2018-20839\nCVE-2019-2923\nCVE-2019-2922\nCVE-2019-2911\nCVE-2019-2914\nCVE-2019-2924\nCVE-2019-2910\nCVE-2019-2938\nCVE-2019-2993\nCVE-2019-2974\nCVE-2019-2960\nCVE-2019-2948\nCVE-2019-2946  CVE-2019-2969
 
 Test Case - Verfiy Project Level CVE Whitelist
-    [Tags]  run-once
-    Init Chrome Driver
-    ${d}=    Get Current Date    result_format=%m%s
-    ${image}=    Set Variable    mariadb
-    #For docker-hub registry
-    #${sha256}=  Set Variable  c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d
-    #For internal CPE harbor registry
-    ${sha256}=  Set Variable  b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1
-    ${signin_user}=    Set Variable  user025
-    ${signin_pwd}=    Set Variable  Test1@34
-    Sign In Harbor    ${HARBOR_URL}    ${signin_user}    ${signin_pwd}
-    Create An New Project    project${d}
-    Push Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    sha256=${sha256}
-    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Go Into Project  project${d}
-    Set Vulnerabilty Serverity  2
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Go Into Project  project${d}
-    Go Into Repo  project${d}/${image}
-    Scan Repo  ${sha256}  Succeed
-    Go Into Project  project${d}
-    Add Items to Project CVE Whitelist    CVE-2019-13050\nCVE-2018-19591\nCVE-2018-11236\nCVE-2018-11237\nCVE-2019-13627\nCVE-2018-20839\nCVE-2019-2923\nCVE-2019-2922\nCVE-2019-2911\nCVE-2019-2914\nCVE-2019-2924\nCVE-2019-2910\nCVE-2019-2938\nCVE-2019-2993\nCVE-2019-2974\nCVE-2019-2960\nCVE-2019-2948\nCVE-2019-2946
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Add Items to Project CVE Whitelist    CVE-2019-2969
-    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Delete Top Item In Project CVE Whitelist
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Close Browser
+    Body Of Verfiy Project Level CVE Whitelist  mariadb  b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1  CVE-2019-13050\nCVE-2018-19591\nCVE-2018-11236\nCVE-2018-11237\nCVE-2019-13627\nCVE-2018-20839\nCVE-2019-2923\nCVE-2019-2922\nCVE-2019-2911\nCVE-2019-2914\nCVE-2019-2924\nCVE-2019-2910\nCVE-2019-2938\nCVE-2019-2993\nCVE-2019-2974\nCVE-2019-2960\nCVE-2019-2948\nCVE-2019-2946  CVE-2019-2969
 
 Test Case - Verfiy Project Level CVE Whitelist By Quick Way of Add System
-    [Tags]  run-once
-    Init Chrome Driver
-    ${d}=    Get Current Date    result_format=%m%s
-    ${image}=    Set Variable    mariadb
-    #For docker-hub registry
-    #${sha256}=  Set Variable  c396eb803be99041e69eed84b0eb880d5474a6b2c1fd5a84268ce0420088d20d
-    #For internal CPE harbor registry
-    ${sha256}=  Set Variable  b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1
-    ${signin_user}=    Set Variable  user025
-    ${signin_pwd}=    Set Variable  Test1@34
-    Sign In Harbor    ${HARBOR_URL}    ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
-    Switch To Configure
-    Switch To Configuration System Setting
-    Add Items To System CVE Whitelist    CVE-2019-13050\nCVE-2018-19591\nCVE-2018-11236\nCVE-2018-11237\nCVE-2019-13627\nCVE-2018-20839\nCVE-2019-2923\nCVE-2019-2922\nCVE-2019-2911\nCVE-2019-2914\nCVE-2019-2924\nCVE-2019-2910\nCVE-2019-2938\nCVE-2019-2993\nCVE-2019-2974\nCVE-2019-2960\nCVE-2019-2948\nCVE-2019-2946\nCVE-2019-2969
-    Logout Harbor
-    Sign In Harbor    ${HARBOR_URL}    ${signin_user}    ${signin_pwd}
-    Create An New Project    project${d}
-    Push Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    sha256=${sha256}
-    Go Into Project  project${d}
-    Set Vulnerabilty Serverity  2
-    Go Into Project  project${d}
-    Go Into Repo  project${d}/${image}
-    Scan Repo  ${sha256}  Succeed
-    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Go Into Project  project${d}
-    Set Project To Project Level CVE Whitelist
-    Cannot Pull image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Add System CVE Whitelist to Project CVE Whitelist By Add System Button Click
-    Pull Image    ${ip}    ${signin_user}    ${signin_pwd}    project${d}    ${image}    tag=${sha256}
-    Close Browser
\ No newline at end of file
+    Body Of Verfiy Project Level CVE Whitelist By Quick Way of Add System  mariadb  b5e273ed46d2b5a1c96bf8f3ae37aa5e90c6c481e7f7ae66744610d7df79cbd1  CVE-2019-13050\nCVE-2018-19591\nCVE-2018-11236\nCVE-2018-11237\nCVE-2019-13627\nCVE-2018-20839\nCVE-2019-2923\nCVE-2019-2922\nCVE-2019-2911\nCVE-2019-2914\nCVE-2019-2924\nCVE-2019-2910\nCVE-2019-2938\nCVE-2019-2993\nCVE-2019-2974\nCVE-2019-2960\nCVE-2019-2948\nCVE-2019-2946\nCVE-2019-2969
\ No newline at end of file
diff --git a/tests/robot-cases/Group1-Nightly/Trivy.robot b/tests/robot-cases/Group1-Nightly/Trivy.robot
index 473131106..e662906e7 100644
--- a/tests/robot-cases/Group1-Nightly/Trivy.robot
+++ b/tests/robot-cases/Group1-Nightly/Trivy.robot
@@ -142,4 +142,14 @@ Test Case - Project Level Image Serverity Policy
     Go Into Project  project${d}
     Set Vulnerabilty Serverity  3
     Cannot pull image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  project${d}  ${image}  tag=${sha256}
-    Close Browser
\ No newline at end of file
+    Close Browser
+
+#Important Note: All CVE IDs in CVE Whitelist cases must unique!
+Test Case - Verfiy System Level CVE Whitelist
+    Body Of Verfiy System Level CVE Whitelist  goharbor/harbor-portal  2cb6a1c24dd6b88f11fd44ccc6560cb7be969f8ac5f752802c99cae6bcd592bb  CVE-2019-19317\nCVE-2019-19646 \nCVE-2019-5188 \nCVE-2019-20387 \nCVE-2019-17498 \nCVE-2019-20372 \nCVE-2019-19244 \nCVE-2019-19603 \nCVE-2019-19880 \nCVE-2019-19923 \nCVE-2019-19925 \nCVE-2019-19926 \nCVE-2019-19959 \nCVE-2019-20218 \nCVE-2019-19232 \nCVE-2019-19234 \nCVE-2019-19645  CVE-2019-18276
+
+Test Case - Verfiy Project Level CVE Whitelist
+    Body Of Verfiy Project Level CVE Whitelist  goharbor/harbor-portal  2cb6a1c24dd6b88f11fd44ccc6560cb7be969f8ac5f752802c99cae6bcd592bb  CVE-2019-19317\nCVE-2019-19646 \nCVE-2019-5188 \nCVE-2019-20387 \nCVE-2019-17498 \nCVE-2019-20372 \nCVE-2019-19244 \nCVE-2019-19603 \nCVE-2019-19880 \nCVE-2019-19923 \nCVE-2019-19925 \nCVE-2019-19926 \nCVE-2019-19959 \nCVE-2019-20218 \nCVE-2019-19232 \nCVE-2019-19234 \nCVE-2019-19645  CVE-2019-18276
+
+Test Case - Verfiy Project Level CVE Whitelist By Quick Way of Add System
+    Body Of Verfiy Project Level CVE Whitelist By Quick Way of Add System  goharbor/harbor-portal  2cb6a1c24dd6b88f11fd44ccc6560cb7be969f8ac5f752802c99cae6bcd592bb  CVE-2019-19317\nCVE-2019-19646 \nCVE-2019-5188 \nCVE-2019-20387 \nCVE-2019-17498 \nCVE-2019-20372 \nCVE-2019-19244 \nCVE-2019-19603 \nCVE-2019-19880 \nCVE-2019-19923 \nCVE-2019-19925 \nCVE-2019-19926 \nCVE-2019-19959 \nCVE-2019-20218 \nCVE-2019-19232 \nCVE-2019-19234 \nCVE-2019-19645 \nCVE-2019-18276
\ No newline at end of file