tests: Add initial swarm tests #199

GabyCT · 2018-04-03T18:38:28Z

This will enable basic swarm tests.

Fixes #198

Signed-off-by: Gabriela Cervantes [email protected]

devimc · 2018-04-04T12:42:48Z

integration/swarm/swarm.bats

+		if [ "$replicas_running" -ge "$number_of_replicas" ]; then
+			break;
+		fi
+		sleep


missing operand

chavafg · 2018-04-04T12:40:13Z

integration/swarm/swarm.bats

+		if [ "$replicas_running" -ge "$number_of_replicas" ]; then
+			break;
+		fi
+		sleep


missing value on sleep?

chavafg · 2018-04-04T12:46:11Z

integration/swarm/swarm.bats

+teardown() {
+	docker service remove "${SERVICE_NAME}"
+	docker swarm leave --force
+	check_processes ${SHIM_PATH}


should we also check for qemu and proxy processes?

chavafg · 2018-04-04T12:49:05Z

integration/swarm/swarm.bats

+		--name "${SERVICE_NAME}" --replicas $number_of_replicas \
+		--publish 8080:80 "${nginx_image}" sh -c "$nginx_command"
+	running_regex='Running\s+\d+\s(seconds|minutes)\s+ago'
+	for i in $(seq "$timeout") ; do


you should check the $i value inside the loop to see if we have reached the timeout and if so, return 1?

chavafg · 2018-04-04T12:55:32Z

integration/swarm/swarm.bats

+	running_regex='Running\s+\d+\s(seconds|minutes)\s+ago'
+	for i in $(seq "$timeout") ; do
+		docker service ls --filter name="$SERVICE_NAME"
+		replicas_running=$(docker service ps "$SERVICE_NAME" | grep -P "${running_regex}"  | wc -l)


you can use grep -c -P "${running_regex}" and remove wc -l

GabyCT · 2018-04-04T15:29:33Z

@chavafg the ci is failing with the following error .ci/teardown.sh "$WORKSPACE"
[kata-containers-tests-ubuntu-16-04-PR] $ /bin/bash /tmp/jenkins2389151152929419399.sh
sudo: kata-collect-data.sh: command not found
~/jenkins_slave/workspace/kata-containers-tests-ubuntu-16-04-PR ~/jenkins_slave/workspace/kata-containers-tests-ubuntu-16-04-PR/go/src/github.com/kata-containers/tests
gzip: kata-collect-data_*: No such file or directory

Any idea?

jodh-intel · 2018-04-04T15:32:33Z

@GabyCT - I think this is due to #194. I'll raise a PR to resolve that now...

GabyCT · 2018-04-04T15:33:52Z

@jodh-intel thanks :)

chavafg · 2018-04-04T15:37:15Z

I think that is not the root cause, above you can see:

~/jenkins_slave/workspace/kata-containers-tests-ubuntu-16-04-PR/go/src/github.com/kata-containers/osbuilder/image-builder ~/jenkins_slave/workspace/kata-containers-tests-ubuntu-16-04-PR/go/src/github.com/kata-containers/tests
ERROR: ../rootfs-builder/rootfs is not a directory
Build step 'Execute shell' marked build as failure

chavafg · 2018-04-04T15:38:20Z

maybe because of: kata-containers/osbuilder#63 ?

jodh-intel · 2018-04-04T15:53:33Z

Yes - that does look like an issue. @erick0z - could you take a look?

chavafg · 2018-04-04T16:15:51Z

testing locally, the old rootfs directory is now called rootfs-Clear, because we are using clearlinux as the OS_BUILDER_DISTRO:

OSBUILDER_DISTRO=${OSBUILDER_DISTRO:-clearlinux}

~/go/src/github.com/kata-containers/osbuilder/image-builder ~/go/src/github.com/kata-containers/tests
+ sudo -E AGENT_INIT=no USE_DOCKER=true ./image_builder.sh ../rootfs-builder/rootfs
ERROR: ../rootfs-builder/rootfs is not a directory

So I can change the name of the directory, but as we will test more distros in the future I am not sure what will be the best option here.
Maybe the directory should be called rootfs-clearlinux instead of rootfs-Clear?

cc @erick0z, @jcvenegas @jodh-intel @devimc

erick0z · 2018-04-04T16:23:33Z

@chavafg @jodh-intel Let me take a look!

jodh-intel · 2018-04-04T16:23:49Z

Good catch @chavafg!

Now that the mega PR in osbuilder has landed, it looks like we can change the rootfs directory name by just setting ROOTFS_DIR=rootfs:

https://github.com/kata-containers/osbuilder/blob/master/rootfs-builder/rootfs.sh#L185..L187

chavafg · 2018-04-04T16:57:10Z

@jodh-intel, seems like it will need to be an absolute path, and after I changed to

export ROOTFS_DIR="${GOPATH}/src/${osbuilder_repo}/rootfs-builder/rootfs"

I am still getting the error. Seems like the rootfs directory is not being populated.

erick0z · 2018-04-04T17:50:16Z

@chavafg The latest changes introduced to the osbuilder repo changes the resulting rootfs directory name, so the ../rootfs-builder/rootfs directory won't exist anymore. It should exist, for instance: ../rootfs-builder/rootfs-Clear.

Have you tried the following?
sudo -E AGENT_INIT=no USE_DOCKER=true ./image_builder.sh ../rootfs-builder/rootfs-Clear

Other option is, when building the rootfs:
sudo -E PATH=$PATH DISTRO=clearlinux DISTRO_ROOTFS="${GOPATH}/src/${osbuilder_repo}/rootfs-builder/rootfs" make rootfs
This will populate the ../rootfs dir with a clearlinux rootfs

chavafg · 2018-04-04T21:29:30Z

@GabyCT opened #212, which solve the issue, after it is merged, please rebase your branch

GabyCT · 2018-04-05T15:35:56Z

@jodh-intel thanks for the help and @chavafg thanks for solving the issue with the CI, the problem was solved

GabyCT · 2018-04-05T20:47:36Z

@chavafg changes applied

This will enable basic swarm tests. Fixes kata-containers#198 Signed-off-by: Gabriela Cervantes <[email protected]>

chavafg · 2018-04-09T14:36:30Z

integration/swarm/swarm.bats

+		if [ "$replicas_running" -ge "$number_of_replicas" ]; then
+			break
+		fi
+		sleep 1


can you add below something like:
[ "$i" == "$timeout" ] && return 1
which would mean that we are reaching the timeout and no replicas were running, then we need to fail.

GabyCT · 2018-04-10T21:19:56Z

@chavafg changes applied

devimc

lgtm

GabyCT force-pushed the topic/addswarm branch 3 times, most recently from 9859b3c to a2a3c04 Compare April 3, 2018 21:14

jodh-intel mentioned this pull request Apr 4, 2018

document swarm docker version more clearly kata-containers/runtime#181

Closed

devimc reviewed Apr 4, 2018

View reviewed changes

integration/swarm/swarm.bats Outdated

if [ "$replicas_running" -ge "$number_of_replicas" ]; then

break;

fi

sleep

Copy link

devimc Apr 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing operand

chavafg suggested changes Apr 4, 2018

View reviewed changes

GabyCT force-pushed the topic/addswarm branch 2 times, most recently from 76c82d4 to 2ba737e Compare April 4, 2018 14:59

tests: Add initial swarm tests

3cef92a

This will enable basic swarm tests. Fixes kata-containers#198 Signed-off-by: Gabriela Cervantes <[email protected]>

chavafg reviewed Apr 9, 2018

View reviewed changes

GabyCT force-pushed the topic/addswarm branch 3 times, most recently from 74fec7c to 3cef92a Compare April 9, 2018 18:49

chavafg approved these changes Apr 12, 2018

View reviewed changes

devimc approved these changes Apr 12, 2018

View reviewed changes

devimc merged commit 06261bc into kata-containers:master Apr 12, 2018

GabyCT deleted the topic/addswarm branch July 29, 2021 21:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests: Add initial swarm tests #199

tests: Add initial swarm tests #199

GabyCT commented Apr 3, 2018

devimc Apr 4, 2018

chavafg Apr 4, 2018

chavafg Apr 4, 2018

chavafg Apr 4, 2018

chavafg Apr 4, 2018

GabyCT commented Apr 4, 2018

jodh-intel commented Apr 4, 2018

GabyCT commented Apr 4, 2018

chavafg commented Apr 4, 2018

chavafg commented Apr 4, 2018

jodh-intel commented Apr 4, 2018

chavafg commented Apr 4, 2018

erick0z commented Apr 4, 2018

jodh-intel commented Apr 4, 2018

chavafg commented Apr 4, 2018

erick0z commented Apr 4, 2018 •

edited

Loading

chavafg commented Apr 4, 2018

GabyCT commented Apr 5, 2018

GabyCT commented Apr 5, 2018

chavafg Apr 9, 2018

GabyCT commented Apr 10, 2018

devimc left a comment

tests: Add initial swarm tests #199

tests: Add initial swarm tests #199

Conversation

GabyCT commented Apr 3, 2018

devimc Apr 4, 2018

Choose a reason for hiding this comment

chavafg Apr 4, 2018

Choose a reason for hiding this comment

chavafg Apr 4, 2018

Choose a reason for hiding this comment

chavafg Apr 4, 2018

Choose a reason for hiding this comment

chavafg Apr 4, 2018

Choose a reason for hiding this comment

GabyCT commented Apr 4, 2018

jodh-intel commented Apr 4, 2018

GabyCT commented Apr 4, 2018

chavafg commented Apr 4, 2018

chavafg commented Apr 4, 2018

jodh-intel commented Apr 4, 2018

chavafg commented Apr 4, 2018

erick0z commented Apr 4, 2018

jodh-intel commented Apr 4, 2018

chavafg commented Apr 4, 2018

erick0z commented Apr 4, 2018 • edited Loading

chavafg commented Apr 4, 2018

GabyCT commented Apr 5, 2018

GabyCT commented Apr 5, 2018

chavafg Apr 9, 2018

Choose a reason for hiding this comment

GabyCT commented Apr 10, 2018

devimc left a comment

Choose a reason for hiding this comment

erick0z commented Apr 4, 2018 •

edited

Loading