Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392696 )
Change subject: Migrate labs/tools/striker to Docker ...................................................................... Migrate labs/tools/striker to Docker A custom Docker image to fullfill pyldap compile dependencies. Create labs-striker-tox-docker Change-Id: I154ad96fec0bc2a7aadaa090324bb8b82639fbe1 --- A dockerfiles/tox-labs-striker/Dockerfile A dockerfiles/tox-labs-striker/example-run.sh M jjb/labs.yaml M zuul/layout.yaml 4 files changed, 33 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/96/392696/1 diff --git a/dockerfiles/tox-labs-striker/Dockerfile b/dockerfiles/tox-labs-striker/Dockerfile new file mode 100644 index 0000000..9f0bfb4 --- /dev/null +++ b/dockerfiles/tox-labs-striker/Dockerfile @@ -0,0 +1,11 @@ +FROM wmfreleng/tox + +USER root +RUN apt-get update && \ + apt-get install --yes \ + libldap2-dev \ + libsasl2-dev \ + && \ + rm -rf /var/lib/apt/lists/* + +USER nobody diff --git a/dockerfiles/tox-labs-striker/example-run.sh b/dockerfiles/tox-labs-striker/example-run.sh new file mode 100644 index 0000000..beb125c --- /dev/null +++ b/dockerfiles/tox-labs-striker/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=labs/striker \ + --env ZUUL_COMMIT=master \ + --env ZUUL_REF=master \ + --volume /"$(pwd)"/log://log \ + --volume /"$(pwd)"/cache://cache \ + wmfreleng/tox-labs-striker:latest diff --git a/jjb/labs.yaml b/jjb/labs.yaml index 8ad5a78..f566dc9 100644 --- a/jjb/labs.yaml +++ b/jjb/labs.yaml @@ -1,6 +1,12 @@ # Holds various projects under 'labs/' - project: + name: 'labs-striker' + jobs: + - '{name}-tox-docker': + docker_image_var: wmfreleng/tox-labs-striker:v2017.11.21.19.24 + +- project: # labs-tools-Zppixbot name: 'labs-tools-ZppixBot' phpflavor: 'php55' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index f39b6cd..234a946 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1671,11 +1671,9 @@ - name: labs/striker test: - - labs-tox-jessie # pyldap requires libsasl2-dev / libldap2-dev etc + - labs-striker-tox-docker gate-and-submit: - - labs-tox-jessie # pyldap requires libsasl2-dev / libldap2-dev etc - experimental: - - labs-tox-docker + - labs-striker-tox-docker - name: labs/striker/deploy test: -- To view, visit https://gerrit.wikimedia.org/r/392696 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I154ad96fec0bc2a7aadaa090324bb8b82639fbe1 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
