Remove workround for docker20 adaptation

Signed-off-by: danfengliu <danfengl@vmware.com>

tests/resources/Docker-Util.robot

@@ -34,8 +34,6 @@ Pull image
     Should Contain  ${output}  Digest:
     Should Contain  ${output}  Status:
     Should Not Contain  ${output}  No such image:
-    #Remove image for docker 20
-    Clean All Local Images
 
 Push image
     # If no tag provided in $(image_with_or_without_tag}, latest will be the tag pulled from docker-hub or read from local
@@ -53,8 +51,6 @@ Push image
     ...  ELSE  Wait Unitl Command Success  docker tag ${image_in_use} ${ip}/${project}/${image_in_use_with_tag}
     Wait Unitl Command Success  docker push ${ip}/${project}/${image_in_use_with_tag}
     Wait Unitl Command Success  docker logout ${ip}
-    #Remove image for docker 20
-    Clean All Local Images
     Sleep  1
 
 Push Image With Tag
@@ -66,14 +62,6 @@ Push Image With Tag
     Wait Unitl Command Success  docker tag ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image}:${tag1} ${ip}/${project}/${image}:${tag}
     Wait Unitl Command Success  docker push ${ip}/${project}/${image}:${tag}
     Wait Unitl Command Success  docker logout ${ip}
-    #Remove image for docker 20
-    Clean All Local Images
-
-Clean All Local Images
-    ${rc}  ${out}=  Run Keyword And Ignore Error  Run  docker rmi -f $(docker images -a -q)
-    Log All  ${out}
-    ${rc}  ${out}=  Run Keyword And Ignore Error  Run  docker system prune -a -f
-    Log All  ${out}
 
 Cannot Docker Login Harbor
     [Arguments]  ${ip}  ${user}  ${pwd}
@@ -81,8 +69,6 @@ Cannot Docker Login Harbor
 
 Cannot Pull Image
     [Arguments]  ${ip}  ${user}  ${pwd}  ${project}  ${image}  ${tag}=${null}  ${err_msg}=${null}
-    Restart Process Locally  containerd
-    Restart Process Locally  dockerd
     ${image_with_tag}=  Set Variable If  '${tag}'=='${null}'  ${image}  ${image}:${tag}
     Wait Unitl Command Success  docker login -u ${user} -p ${pwd} ${ip}
     FOR  ${idx}  IN RANGE  0  30
@@ -90,7 +76,6 @@ Cannot Pull Image
         Exit For Loop If  '${out[0]}'=='PASS'
         Sleep  3
     END
-    Clean All Local Images
     Log To Console  Cannot Pull Image - Pull Log: ${out[1]}
     Should Be Equal As Strings  '${out[0]}'  'PASS'
     Run Keyword If  '${err_msg}' != '${null}'  Should Contain  ${out[1]}  ${err_msg}
@@ -106,7 +91,6 @@ Cannot Push image
     Run Keyword If  '${err_msg}' != '${null}'  Should Contain  ${output}  ${err_msg}
     Run Keyword If  '${err_msg_2}' != '${null}'  Should Contain  ${output}  ${err_msg_2}
     Wait Unitl Command Success  docker logout ${ip}
-    Clean All Local Images
 
 Wait Until Container Stops
     [Arguments]  ${container}
@@ -219,6 +203,12 @@ Kill Local Docker Daemon
     Process Should Be Stopped  ${handle}
     Wait Unitl Command Success  kill -9 ${dockerd-pid}
 
+Clean All Local Images
+    ${rc}  ${out}=  Run Keyword And Ignore Error  Run  docker rmi -f $(docker images -a -q)
+    Log All  ${out}
+    ${rc}  ${out}=  Run Keyword And Ignore Error  Run  docker system prune -a -f
+    Log All  ${out}
+
 Docker Login Fail
     [Arguments]  ${ip}  ${user}  ${pwd}
     Log To Console  \nRunning docker login ${ip} ...
@@ -260,7 +250,6 @@ Docker Image Can Not Be Pulled
         Log To Console  Docker pull return value is ${out}
         Sleep  3
     END
-    Clean All Local Images
     Log To Console  Cannot Pull Image From Docker - Pull Log: ${out[1]}
     Should Be Equal As Strings  '${out[0]}'  'PASS'
 
@@ -275,6 +264,5 @@ Docker Image Can Be Pulled
         Exit For Loop If  '${out[0]}'=='PASS'
         Sleep  5
     END
-    Clean All Local Images
     Run Keyword If  '${out[0]}'=='FAIL'  Capture Page Screenshot
     Should Be Equal As Strings  '${out[0]}'  'PASS'

tests/resources/Harbor-Pages/OIDC_Auth_Elements.robot

@@ -28,3 +28,4 @@ ${save_btn}       //*[@id='saveButton']
 ${OIDC_USERNAME}  test1
 ${generate_secret_btn}       //*[@id='generate-cli-btn']
 ${more_btn}       //*[@id='hidden-generate-cli']
+${reset_secret_btn}       //*[@id='reset-cli-btn']

tests/resources/Nightly-Util.robot

@@ -52,8 +52,8 @@ Nightly Test Setup In Ubuntu
     Prepare Test Tools
     Log To Console  Start Docker Daemon Locally ...
     Run Keyword  Start Docker Daemon Locally
-    Log To Console  Start Containerd Daemon Locally ...
+    #Log To Console  Start Containerd Daemon Locally ...
-    Run Keyword  Start Containerd Daemon Locally
+    #Run Keyword  Start Containerd Daemon Locally
     Prepare Helm Plugin
     Run Keyword If  '${DOCKER_USER}' != '${EMPTY}'  Docker Login  ""  ${DOCKER_USER}  ${DOCKER_PWD}
 

tests/resources/TestCaseBody.robot

@@ -171,7 +171,7 @@ Body Of Admin Push Signed Image
     Wait Unitl Command Success  rm -rf ~/.docker/
     Docker Pull  ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image}
     ${rc}  ${output}=  Run And Return Rc And Output  ./tests/robot-cases/Group0-Util/notary-push-image.sh ${ip} ${project} ${image} ${tag} ${notaryServerEndpoint} ${LOCAL_REGISTRY}/${LOCAL_REGISTRY_NAMESPACE}/${image}:${tag} ${user} ${pwd}
-    Clean All Local Images
+
     Log  ${output}
     Should Be Equal As Integers  ${rc}  0
 

tests/robot-cases/Group1-Nightly/Common.robot

@@ -51,6 +51,7 @@ Test Case - Push ORAS and Display
     Wait Until Page Contains  ${tag}
     Close Browser
 
+## TODO: uncomment it once #14470 fixed
 # Test Case - Push SIF and Display
 #     [Tags]  push_sif
 #     Init Chrome Driver
@@ -61,8 +62,6 @@ Test Case - Push ORAS and Display
 #     Sign In Harbor  ${HARBOR_URL}  ${user}  ${pwd}
 #     Create An New Project And Go Into Project  test${d}
 
-#     Clean All Local Images
-
 #     ${repo_name}=  Set Variable  busybox
 #     ${tag}=  Set Variable  1.28
 #     Retry Keyword N Times When Error  5  Push Singularity To Harbor  library:  library/default/  ${ip}  ${user}  ${pwd}  test${d}  ${repo_name}  ${tag}