Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/393194 )
Change subject: Migrate operations/software/conftool to Docker ...................................................................... Migrate operations/software/conftool to Docker Using a new Docker container, since the test suite depends on a few packages. Change-Id: I3f359df25646217fb1f377588641387cd94fa318 --- A dockerfiles/tox-conftool/Dockerfile A dockerfiles/tox-conftool/example-run.sh M jjb/operations-misc.yaml M zuul/layout.yaml 4 files changed, 36 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/94/393194/1 diff --git a/dockerfiles/tox-conftool/Dockerfile b/dockerfiles/tox-conftool/Dockerfile new file mode 100644 index 0000000..dd81a78 --- /dev/null +++ b/dockerfiles/tox-conftool/Dockerfile @@ -0,0 +1,14 @@ +FROM wmfreleng/tox + +USER root +RUN apt-get update && \ + apt-get install --yes \ + python-etcd \ + python-conftool \ + etcd \ + python-etcd \ + python-conftool \ + && \ + apt-get clean && rm -rf /var/lib/apt/lists/* + +USER nobody diff --git a/dockerfiles/tox-conftool/example-run.sh b/dockerfiles/tox-conftool/example-run.sh new file mode 100644 index 0000000..c794da6 --- /dev/null +++ b/dockerfiles/tox-conftool/example-run.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +install --mode 777 --directory log cache + +docker run \ + --rm --tty \ + --env JENKINS_URL=1 \ + --env ZUUL_URL=https://gerrit.wikimedia.org/r \ + --env ZUUL_PROJECT=operations/software/conftool \ + --env ZUUL_COMMIT=master \ + --env ZUUL_REF=master \ + --volume /"$(pwd)"/log://log \ + --volume /"$(pwd)"/cache://cache \ + wmfreleng/tox-conftool:latest diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml index 7a71982..d69d2ad 100644 --- a/jjb/operations-misc.yaml +++ b/jjb/operations-misc.yaml @@ -4,6 +4,12 @@ - '{name}-tox-docker': docker_image_var: wmfreleng/tox-cergen:v2017.11.21.16.52 +- project: + name: conftool + jobs: + - '{name}-tox-docker': + docker_image_var: wmfreleng/tox-conftool:v2017.11.24.09.12 + - job-template: name: 'operations-dns-lint' # Depends on production GeoIP T98737 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 11e5adb..746339f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2525,14 +2525,11 @@ - name: operations/software/conftool test: - debian-glue - # requires etcd to be installed for integration tests - - tox-jessie + - conftool-tox-docker gate-and-submit: - debian-glue # requires etcd to be installed for integration tests - - tox-jessie - experimental: - - tox-docker + - conftool-tox-docker - name: operations/software/cumin test: -- To view, visit https://gerrit.wikimedia.org/r/393194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f359df25646217fb1f377588641387cd94fa318 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
