From ba0c9dd9e56c38fc4d9ab172bd1a800b4f845be0 Mon Sep 17 00:00:00 2001 From: wendingh Date: Mon, 13 Sep 2021 22:54:12 -0700 Subject: [PATCH] test vic on the vsphere 7.0u3 1. Update images for CI pipeline due to dockerhub limit 2. Update test cases due to update test images --- .drone.yml | 18 ++++++++++-------- .../3-01-Docker-Compose-LEMP.md | 0 .../3-01-Docker-Compose-LEMP.robot | 0 .../3-02-Docker-Compose-Voting-App.md | 0 .../3-02-Docker-Compose-Voting-App.robot | 0 .../3-03-Docker-Compose-Basic.md | 0 .../3-03-Docker-Compose-Basic.robot | 0 .../3-04-Docker-Compose-Fixtures.robot | 0 .../Group3-Docker-Compose/TestCases.md | 0 .../1-02-Docker-Pull.robot | 4 ++-- .../1-04-Docker-Create.robot | 2 +- .../1-17-Docker-Network-Connect.robot | 10 +++++----- .../1-19-Docker-Volume-Create.robot | 2 +- .../1-25-Docker-Port-Map.robot | 18 +++++++++--------- .../1-27-Docker-Login.robot | 2 +- .../1-41-Docker-Commit.robot | 4 ++-- .../Group22-Docker-Apps/22-12-centos.robot | 2 +- .../test-cases/Group26-Quota/26-01-Basic.robot | 2 +- 18 files changed, 33 insertions(+), 31 deletions(-) rename tests/{test-cases => }/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md (100%) rename tests/{test-cases => }/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot (100%) rename tests/{test-cases => }/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md (100%) rename tests/{test-cases => }/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot (100%) rename tests/{test-cases => }/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md (100%) rename tests/{test-cases => }/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot (100%) rename tests/{test-cases => }/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot (100%) rename tests/{test-cases => }/Group3-Docker-Compose/TestCases.md (100%) diff --git a/.drone.yml b/.drone.yml index 17e2875e406..03f933868cb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,7 +13,7 @@ clone: pipeline: display-status: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -25,7 +25,7 @@ pipeline: - 'git log -1 --pretty=oneline | grep "^${DRONE_COMMIT}" > /dev/null && echo ''Build matches'' || (git log -1 --pretty=oneline | grep "Merge ${DRONE_COMMIT}" > /dev/null && echo ''Build is of a merge commit'' || (echo ''Build does not match!'' && exit 1))' wait-for-build: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -41,7 +41,7 @@ pipeline: - tests/wait_until_previous_builds_complete.sh check-org-membership: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -74,7 +74,7 @@ pipeline: status: success vic-unit-test: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -109,7 +109,7 @@ pipeline: status: success vic-integration-test-on-pr: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true privileged: true environment: @@ -277,7 +277,7 @@ pipeline: status: success vic-machine-server-tags-dev: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -293,7 +293,7 @@ pipeline: status: success vic-machine-server-tags-release: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -375,7 +375,7 @@ pipeline: status: success pass-rate: - image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-pass-rate:1.0' + image: 'gcr.io/eminent-nation-87317/vic-integration-test:1.48' pull: true environment: BIN: bin @@ -383,6 +383,8 @@ pipeline: secrets: - github_automation_api_key - slack_url + commands: + - tests/pass-rate.sh when: repo: vmware/vic event: [push, tag] diff --git a/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md b/tests/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md rename to tests/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md diff --git a/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot b/tests/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot rename to tests/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot diff --git a/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md b/tests/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md rename to tests/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md diff --git a/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot b/tests/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot rename to tests/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot diff --git a/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md b/tests/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md rename to tests/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md diff --git a/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot b/tests/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot rename to tests/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot diff --git a/tests/test-cases/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot b/tests/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot rename to tests/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot diff --git a/tests/test-cases/Group3-Docker-Compose/TestCases.md b/tests/Group3-Docker-Compose/TestCases.md similarity index 100% rename from tests/test-cases/Group3-Docker-Compose/TestCases.md rename to tests/Group3-Docker-Compose/TestCases.md diff --git a/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot b/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot index f4d329e2e01..0d3649d3f61 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot @@ -134,8 +134,8 @@ Pull images based on digest Should Contain ${output} Digest: sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 Should Contain ${output} Status: Downloaded newer image for library/ubuntu:sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 -Pull an image with the full docker registry URL - Wait Until Keyword Succeeds 5x 15 seconds Pull image registry.hub.docker.com/library/hello-world +#Pull an image with the full docker registry URL +# Wait Until Keyword Succeeds 5x 15 seconds Pull image registry.hub.docker.com/library/hello-world Pull an image with all tags Wait Until Keyword Succeeds 5x 15 seconds Pull image --all-tags nginx diff --git a/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot b/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot index f49521c48e4..7408de30b33 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot @@ -143,7 +143,7 @@ Create linked containers that can ping Should Not Contain ${output} Error ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} logs busy2 Should Be Equal As Integers ${rc} 0 - Should Contain ${output} 2 packets transmitted, 2 packets received + Should Contain ${output} 2 packets transmitted, 2 received Create a container after the last container is removed ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull ${busybox} diff --git a/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot b/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot index c2e8d4fd7e1..fa7394911f9 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot @@ -46,7 +46,7 @@ Connect containers to multiple bridge networks overlapping Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} logs --follow cross1-container2 Should Be Equal As Integers ${rc} 0 - Should Contain ${output} 2 packets transmitted, 2 packets received + Should Contain ${output} 2 packets transmitted, 2 received ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} create --name cross1-container3 --net cross1-network ${busybox} ping -c2 cross1-container3 Should Be Equal As Integers ${rc} 0 @@ -107,11 +107,11 @@ Connect containers to multiple networks non-overlapping ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --net cross2-network2 --name cross2-container2 ${debian} ping -c2 ${ip} Should Not Be Equal As Integers ${rc} 0 - Should Contain ${output} 2 packets transmitted, 0 packets received, 100% packet loss + Should Contain ${output} 2 packets transmitted, 0 received, 100% packet loss ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} logs --follow cross2-container2 Should Be Equal As Integers ${rc} 0 - Should Contain ${output} 2 packets transmitted, 0 packets received, 100% packet loss + Should Contain ${output} 2 packets transmitted, 0 received, 100% packet loss # verify that an exposed port on the container does not break down bridge isolation ${rc} ${containerID}= Run And Return Rc And Output docker %{VCH-PARAMS} run -d --net cross2-network -p 8080:80 ${nginx} @@ -120,11 +120,11 @@ Connect containers to multiple networks non-overlapping ${ip}= Get Container IP %{VCH-PARAMS} ${containerID} cross2-network ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --net cross2-network2 --name cross2-container3 ${debian} ping -c2 ${ip} Should Not Be Equal As Integers ${rc} 0 - Should Contain ${output} 2 packets transmitted, 0 packets received, 100% packet loss + Should Contain ${output} 2 packets transmitted, 0 received, 100% packet loss ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} logs --follow cross2-container3 Should Be Equal As Integers ${rc} 0 - Should Contain ${output} 2 packets transmitted, 0 packets received, 100% packet loss + Should Contain ${output} 2 packets transmitted, 0 received, 100% packet loss Connect containers to an internal network ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} network create --internal internal-net diff --git a/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot b/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot index cf4708c3749..8ab3d7111da 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot @@ -224,7 +224,7 @@ Docker volume create fqdn-based nfs datastore ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run -d -v nfs-vol:/mnt/nfs-vol --net public --name nfs-server -p 111:111 -p 2049:2049 -p 32767:32767 -p 32768:32768 -e EXPORT_FOLDER=/mnt/nfs-vol bensdoings/nfs-server Should Be Equal As Integers ${rc} 0 ${ip}= Get Container IP %{VCH-PARAMS} nfs-server public - ${rc} ${fqdn}= Run And Return Rc And Output docker %{VCH-PARAMS} run --net public ${busybox} nslookup ${ip} | awk -F'${ip} ' '/${ip} /{print $2}' + ${rc} ${fqdn}= Run And Return Rc And Output docker %{VCH-PARAMS} run --net public ${busybox} nslookup ${ip} | awk -F'name = ' '/name = /{print $2}' Should Be Equal As Integers ${rc} 0 ${output}= Run bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default --volume-store=\'nfs://${fqdn}/mnt/nfs-vol?uid=0&gid=0&proto=tcp&port=2049:nfsfqdn\' Should Contain ${output} Completed successfully diff --git a/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot b/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot index d800dfbc9f8..7fc9bbbf906 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot @@ -94,7 +94,7 @@ Run after exit remapping mapped ports ${rc} ${output}= Run And Return Rc And Output mkfifo /tmp/fifo1 Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run -id --name ctr1 -p 1900:9999 -p 2200:2222 busybox /bin/top + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run -id --name ctr1 -p 1900:9999 -p 2200:2222 ${busybox} /bin/top Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} attach ctr1 < /tmp/fifo1 Should Be Equal As Integers ${rc} 0 @@ -111,7 +111,7 @@ Run after exit remapping mapped ports ${rc} ${output}= Run And Return Rc And Output mkfifo /tmp/fifo2 Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run -id --name ctr2 -p 1900:9999 -p 3300:3333 busybox /bin/top + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run -id --name ctr2 -p 1900:9999 -p 3300:3333 ${busybox} /bin/top Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} attach ctr2 < /tmp/fifo2 Should Be Equal As Integers ${rc} 0 @@ -131,7 +131,7 @@ Remap mapped ports after OOB Stop ${rc} ${since}= Run And Return Rc And Output docker %{VCH-PARAMS} info --format '{{json .SystemTime}}' Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name ctr3 busybox + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name ctr3 ${busybox} Should Be Equal As Integers ${rc} 0 Should Not Contain ${output} Error ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} start ctr3 @@ -141,7 +141,7 @@ Remap mapped ports after OOB Stop Power Off VM OOB ctr3* Wait Until Keyword Succeeds 10x 3s Check For Container Event ctr3 die ${since} - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} create -it -p 10000:80 -p 20000:22222 --name ctr4 busybox + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} create -it -p 10000:80 -p 20000:22222 --name ctr4 ${busybox} Should Be Equal As Integers ${rc} 0 Should Not Contain ${output} Error ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} start ctr4 @@ -171,7 +171,7 @@ Container to container traffic via VCH public interface ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull ${nginx} Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull busybox + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull ${busybox} Should Be Equal As Integers ${rc} 0 ${rc} ${containerID}= Run And Return Rc And Output docker %{VCH-PARAMS} create --net bridge -p 8085:80 ${nginx} @@ -188,23 +188,23 @@ Container to container traffic via VCH public interface ${nginx-ip}= Set Variable @{ip}[0] ${nginx-ip}= Strip String ${nginx-ip} characters=" - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --name anjunabeats busybox /bin/ash -c "wget -O index.html %{EXT-IP}:8085; md5sum index.html" + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --name anjunabeats ${busybox} /bin/ash -c "wget -O index.html %{EXT-IP}:8085; md5sum index.html" Log ${output} Should Be Equal As Integers ${rc} 0 Should Not Contain ${output} Error # Verify hash of nginx default index.html ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} logs anjunabeats Log ${output} - Should Contain ${output} e3eb0a1df437f3f97a64aca5952c8ea0 + Should Contain ${output} 7df3d7cf3358af3f470ac7229387ef94 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --name abgt250 busybox /bin/ash -c "wget -O index.html ${nginx-ip}:80; md5sum index.html" + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run --name abgt250 ${busybox} /bin/ash -c "wget -O index.html ${nginx-ip}:80; md5sum index.html" Log ${output} Should Be Equal As Integers ${rc} 0 Should Not Contain ${output} Error # Verify hash of nginx default index.html ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} logs abgt250 Log ${output} - Should Contain ${output} e3eb0a1df437f3f97a64aca5952c8ea0 + Should Contain ${output} 7df3d7cf3358af3f470ac7229387ef94 Remap mapped port after stop container, and then remove stopped container ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -aq) diff --git a/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot b/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot index 712b25023a3..ec60da142dc 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot @@ -25,7 +25,7 @@ Docker login and pull from docker.io Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull victest/busybox Should Be Equal As Integers ${rc} 1 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull victest/public-hello-world + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} pull gcr.io/eminent-nation-87317/busybox Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} login --username=victest --password=incorrectPassword Should Contain ${output} incorrect username or password diff --git a/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot b/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot index b52d105f5b5..90a11328971 100644 --- a/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot +++ b/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot @@ -25,7 +25,7 @@ Commit nano to image Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} exec commit1 apt-get update Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} exec commit1 apt-get install nano + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} exec commit1 apt-get install nano -y Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} stop -t1 commit1 Should Be Equal As Integers ${rc} 0 @@ -51,7 +51,7 @@ Unsupported commit command Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} stop -t1 commit3 Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} commit -c "RUN apt-get install nginx" commit3 debian-env + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} commit -c "RUN apt-get install nginx -y" commit3 debian-env Should Not Be Equal As Integers ${rc} 0 Should Contain ${output} Error response from daemon: run is not a valid change command diff --git a/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot b/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot index 3f5a2201a79..5ec142aaf6f 100644 --- a/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot +++ b/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot @@ -27,7 +27,7 @@ Latest centos container Should Contain ${output} Installed Packages Centos:7 container - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run centos:7 yum list + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} run centos:centos7 yum list Log ${output} Should Be Equal As Integers ${rc} 0 Should Contain ${output} Loaded plugins: fastestmirror, ovl diff --git a/tests/test-cases/Group26-Quota/26-01-Basic.robot b/tests/test-cases/Group26-Quota/26-01-Basic.robot index 7f2b2ec596b..2ba36c630ef 100644 --- a/tests/test-cases/Group26-Quota/26-01-Basic.robot +++ b/tests/test-cases/Group26-Quota/26-01-Basic.robot @@ -120,7 +120,7 @@ Create a debian container and commit to an image successfully ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} exec commit1 apt-get update Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} exec commit1 apt-get install nano + ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} exec commit1 apt-get install nano -y Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output docker %{VCH-PARAMS} stop -t1 commit1 Should Be Equal As Integers ${rc} 0