Use Docker for testing on Travis, start on 16.04 support #649

aneeshusa · 2017-04-27T02:19:21Z

Use pinned Docker images to test our states on multiple OSes.
Currently, only servo-linux1 is tested, on Ubuntu 14.04 and 16.04.
Also note that some states are not tested since they don't make
sense in a Docker container, mainly the service states;
these still need to be updated for systemd.

This starts updating the Salt states for Ubuntu 16.04 compatibility,
and thus helps with #462.

Also, make the tests run on Python 3.4, which is the default Python 3 on 14.04.
See commit messages for some other miscellaneous changes.

This change is


        Avoid using variables in printf format strings

This can potentially cause security issues.


        Use consistent style for bash function declaration


        Only use sudo if necessary

Ubuntu 16.04 Docker images don't come with sudo.

aneeshusa · 2017-04-27T02:19:34Z

r? @metajack

metajack

Looks good overall.

metajack · 2017-04-27T16:32:56Z

.travis.yml

+        - SALT_DOCKER_IMAGE=ubuntu@sha256:f3a61450ae43896c4332bda5e78b453f4a93179045f20c8181043b26b5e79028
+      os: linux
+      sudo: required
+      dist: trusty


It's no longer Trusty but Xenial, no? Or are we still doing xenial testing within docker on trusty travis machines?

Travis doesn't have Xenial machines, so we're using Xenial Docker containers on their Trusty VMs.

metajack · 2017-04-27T16:32:56Z

.travis/install_salt.sh

 }

+SUDO=""


Instead of duplicating this code, maybe we need a common.bash that these files include.

I thought about doing that, but I don't think it's worth it (yet) since it's only a few lines of duplication.
Having another file also breaks the curl install.sh | bash workflow, which is nice to setup another machine.

metajack · 2017-04-27T16:32:56Z

test.py

-        python_scripts = filter(is_python_script, os.scandir(test_dir))
-        tests = sorted([entry.name for entry in python_scripts])
-
+        # TODO(aneeshusa): switch back to scandirr


I'd probably add a ntoe that this is needed because scandir is from python 3.5. Otherwise this knowledge of what the TODO item is will be lost.

metajack · 2017-04-27T16:32:56Z

buildbot/master/init.sls

@@ -14,6 +14,7 @@ buildbot-master:
      - twisted == 16.6.0  # NOTE: keep in sync with buildbot-slave sls
    - require:
      - pkg: pip
+  {% if grains.get('virtual_subtype', '') != 'Docker' %}


Why can't we get systemd running inside docker? Not having service.running seems not great, and certainly pollutes the states.

The service.running states underneath call various commands that seem to want to do IPC to a running instance of the int system (Upstart or Systemd). In the container, there is no init process running (just the dispatch.sh inside bash), so the states fail to run. There are purportedly ways to make it all work, but I haven't found a clear guide yet, and I'd like to add at least a basic smoke test now with the option to add service.running support later.

I agree this isn't ideal, so I'm open to other ways to handle this.


        Drop Python requirement for tests to 3.4 from 3.5

Ubuntu Trusty's Python 3 package supplies 3.4, so this makes it possibly to run the tests on Trusty machines without manually installing Python 3.5. To allow running inside Docker, create our own virtualenv for Python test dependencies (e.g. `jinja2`). Don't use the virtualenvs supplied by Travis. Make sure to install some extra Python bits that aren't installed by default for Docker. Rewrite testing code to avoid APIs introduced in Python 3.5. Use block indent and early return in tests.


        Support Ubuntu 16.04 for servo-linux1 states

More work is needed to support the cross build states.


        Skip timezone.system and service.running on Docker

`service.running` requires talking to init, which is not running inside Docker. `timezone.system` on systemd distros uses timedatectl which also wants to talk to a running systemd, so skip that on Docker as well.


        Test `servo-linux1` in Docker on 14.04, 16.04

Use pinned Docker images for 14.04 and 16.04. Re-exec the dispatch script inside a running container to simulate running the tests on other OSes. This is not perfect since various states do not function properly in containers (mainly service-related states), but is still better than nothing and tests package installation, etc.

metajack · 2017-05-05T16:28:27Z

@bors-servo r+

Please file a bug about fixing the systemd issue. I'd like to make sure we eventually remove all those ifdefs :)

bors-servo · 2017-05-05T16:28:28Z

📌 Commit e7698df has been approved by metajack

bors-servo · 2017-05-05T16:28:30Z

⌛ Testing commit e7698df with merge 85d4b83...


        Auto merge of #649 - aneeshusa:use-docker-for-testing-on-travis, r=me…

…tajack Use Docker for testing on Travis, start on 16.04 support Use pinned Docker images to test our states on multiple OSes. Currently, only `servo-linux1` is tested, on Ubuntu 14.04 and 16.04. Also note that some states are not tested since they don't make sense in a Docker container, mainly the `service` states; these still need to be updated for systemd. This starts updating the Salt states for Ubuntu 16.04 compatibility, and thus helps with #462. Also, make the tests run on Python 3.4, which is the default Python 3 on 14.04. See commit messages for some other miscellaneous changes.  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/649)

bors-servo · 2017-05-05T16:53:07Z

☀️ Test successful - status-travis
Approved by: metajack
Pushing 85d4b83 to master...

aneeshusa added 3 commits Apr 17, 2017

Avoid using variables in printf format strings

584b947

This can potentially cause security issues.

Use consistent style for bash function declaration

c606664

Only use sudo if necessary

cc52c0d

Ubuntu 16.04 Docker images don't come with sudo.

highfive added the S-awaiting-review label Apr 27, 2017

highfive assigned metajack Apr 27, 2017

metajack reviewed Apr 27, 2017

View changes

aneeshusa mentioned this pull request Apr 29, 2017

WIP: Add basic Dockerfile #561

Closed

aneeshusa added 4 commits Apr 26, 2017

Support Ubuntu 16.04 for servo-linux1 states

e287843

More work is needed to support the cross build states.

Skip timezone.system and service.running on Docker

0dc7952

`service.running` requires talking to init, which is not running inside Docker. `timezone.system` on systemd distros uses timedatectl which also wants to talk to a running systemd, so skip that on Docker as well.

aneeshusa force-pushed the aneeshusa:use-docker-for-testing-on-travis branch from 96fc469 to e7698df Apr 29, 2017

aneeshusa mentioned this pull request May 3, 2017

Manage `sources.list` and make bootstrap script purge lists before updating #520

Merged

highfive added S-awaiting-merge and removed S-awaiting-review labels May 5, 2017

bors-servo merged commit e7698df into servo:master May 5, 2017
2 checks passed

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label May 5, 2017

bors-servo mentioned this pull request May 5, 2017

WIP: Add mach bootstrap test #631

Closed

aneeshusa mentioned this pull request May 5, 2017

Test systemd-requiring states inside Docker #656

Open

servo / saltfs

Use Docker for testing on Travis, start on 16.04 support #649

Use Docker for testing on Travis, start on 16.04 support #649

aneeshusa commented Apr 27, 2017 •

edited by larsbergstrom

aneeshusa commented Apr 27, 2017

metajack left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

metajack commented May 5, 2017

bors-servo commented May 5, 2017

bors-servo commented May 5, 2017

bors-servo commented May 5, 2017

		}

		SUDO=""

servo / saltfs

Join GitHub today

Use Docker for testing on Travis, start on 16.04 support #649

Use Docker for testing on Travis, start on 16.04 support #649

Conversation

aneeshusa commented Apr 27, 2017 • edited by larsbergstrom

aneeshusa commented Apr 27, 2017

metajack left a comment

This comment has been minimized.

metajack Apr 27, 2017

This comment has been minimized.

aneeshusa Apr 29, 2017

This comment has been minimized.

metajack Apr 27, 2017

This comment has been minimized.

aneeshusa Apr 29, 2017

This comment has been minimized.

metajack Apr 27, 2017

This comment has been minimized.

metajack Apr 27, 2017

This comment has been minimized.

aneeshusa Apr 29, 2017

metajack commented May 5, 2017

bors-servo commented May 5, 2017

bors-servo commented May 5, 2017

bors-servo commented May 5, 2017

aneeshusa commented Apr 27, 2017 •

edited by larsbergstrom