cherry-pick-to-2.1-for-add-2.0-and-2.1-upgrade-pipeline

1. cherry-pick-to-2.1-for-add-2.0-and-2.1-upgrade-pipeline;
2. Some UI text display changed, it cause failure in nightly, text changed in tag retension dry run.

tests/resources/Harbor-Pages/Project-Tag-Retention_Elements.robot

@@ -31,10 +31,10 @@ ${project_tag_retention_config_save_xpath}  //*[@id='config-save']
 ${project_tag_retention_schedule_ok_xpath}  //*[@id='schedule-ok']
 ${project_tag_retention_span_daily_xpath}  //cron-selection//div//span[contains(.,'0 0 0 * * *')]
 ${project_tag_retention_dry_run_xpath}  //*[@id='dry-run']
-${project_tag_retention_record_yes_xpath}  //clr-datagrid[contains(.,'YES')]
+${project_tag_retention_record_yes_xpath}  //clr-datagrid[contains(.,'Yes')]
 ${project_tag_retention_run_now_xpath}  //*[@id='run-now']
 ${project_tag_retention_execute_run_xpath}  //*[@id='execute-run']
-${project_tag_retention_record_no_xpath}  //clr-datagrid[contains(.,'NO')]
+${project_tag_retention_record_no_xpath}  //clr-datagrid[contains(.,'No')]
 ${project_tag_retention_action_button_xpath}  //button[contains(.,'ACTION')]
 ${project_tag_retention_delete_button_xpath}  //div[contains(@class,'dropdown-menu')]//button[contains(.,'Delete')]
 ${project_tag_retention_edit_button_xpath}  //div[contains(@class,'dropdown-menu')]//button[contains(.,'Edit')]

tests/resources/Harbor-Pages/Replication.robot

@@ -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

@@ -38,4 +38,4 @@ 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
+    Should Be Equal As Integers  ${rc}  0

tests/resources/Nightly-Util.robot

@@ -34,6 +34,20 @@ CA Setup
     Prepare Docker Cert  ${ip}
     Prepare Helm Cert
 
+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

@@ -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,0 +1,27 @@
+// 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

tests/robot-cases/Group3-Upgrade/prepare.py

@@ -657,3 +657,4 @@ def do_data_creation():
     harborAPI.add_sys_allowlist(data["configuration"]["deployment_security"], version=args.version)
 
 do_data_creation()
+