Legoktm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/382354 )
Change subject: Port composer-php70 job to docker ...................................................................... Port composer-php70 job to docker Change-Id: I58b74bd5e350f2c3a696f0902a1fe8c4ef0cdfa2 --- A dockerfiles/composer-test/Dockerfile A dockerfiles/composer-test/example-run.sh A dockerfiles/composer-test/run.sh M jjb/php.yaml M zuul/layout.yaml 5 files changed, 48 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/54/382354/1 diff --git a/dockerfiles/composer-test/Dockerfile b/dockerfiles/composer-test/Dockerfile new file mode 100644 index 0000000..1af5c3e --- /dev/null +++ b/dockerfiles/composer-test/Dockerfile @@ -0,0 +1,5 @@ +FROM wmfreleng/composer:latest + +USER nobody +COPY run.sh /run.sh +ENTRYPOINT /bin/bash /run.sh diff --git a/dockerfiles/composer-test/example-run.sh b/dockerfiles/composer-test/example-run.sh new file mode 100644 index 0000000..a9b3a36 --- /dev/null +++ b/dockerfiles/composer-test/example-run.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +install --mode 777 --directory log +docker run \ + --rm --tty \ + --env ZUUL_URL=https://gerrit.wikimedia.org/r \ + --env ZUUL_PROJECT=integration/jenkins \ + --env ZUUL_COMMIT=7a4ee7963a15dbdc5d5afb363600d63574bb31a0 \ + --env ZUUL_REF=refs/changes/31/316231/4 \ + --volume /$(pwd)/log://var/lib/jenkins/log \ + wmfreleng/composer-test:latest diff --git a/dockerfiles/composer-test/run.sh b/dockerfiles/composer-test/run.sh new file mode 100644 index 0000000..cc5962e --- /dev/null +++ b/dockerfiles/composer-test/run.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +set -euxo pipefail + +cd /src + +git init +git fetch --quiet --depth 1 "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF" +git checkout FETCH_HEAD +git submodule --quiet update --init --recursive + +composer --ansi validate --no-check-publish +composer install --no-progress +composer test diff --git a/jjb/php.yaml b/jjb/php.yaml index d9b08ba..db1b8e9 100644 --- a/jjb/php.yaml +++ b/jjb/php.yaml @@ -144,6 +144,23 @@ image: 'wmfreleng/composer-package:v2017.10.05.02.56' logdir: '/log' +- job: + name: 'composer-php70-docker' + node: DebianJessieDocker + concurrent: true + properties: + - build-discarder: + days-to-keep: 15 + triggers: + - zuul + builders: + - docker-zuul-env + - docker-log-dir + - docker-cache-dir + - docker-run-with-log-and-workspace-cache: + image: 'wmfreleng/composer-test:v2017.10.05.03.56' + logdir: '/log' + # Couple jobs with a {name} prefix - job-template: !!merge : *job_composer-phpflavor-image diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 69a0d10..80929c7 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1167,7 +1167,7 @@ - composer-hhvm-jessie gate-and-submit-swat: *composer-test-gate-and-submit experimental: - - composer-php70-jessie + - composer-php70-docker - name: mwgate-composer check: -- To view, visit https://gerrit.wikimedia.org/r/382354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58b74bd5e350f2c3a696f0902a1fe8c4ef0cdfa2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Legoktm <lego...@member.fsf.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
