jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/392633 )
Change subject: Pass env to docker run [2] ...................................................................... Pass env to docker run [2] It is tedious and error prone to have maintain a whitelist of environment variables. Instead just pass the whole environment to docker using bash process substitution <(/usr/bin/env) which creates a file. Remove the macro docker-zuul-env entirely. Previously applied and reverted since Zuul injected variables later caused bash to error out with unbound variables. Update: apps-android-wikipedia-tox-docker composer-package-php70-docker composer-php70-docker cumin-tox-docker fundraising-tools-tox-docker integration-config-tox-docker labs-tox-docker lintr-docker lintr-docker-non-voting mediawiki-core-php70-phan-docker mediawiki-core-phpcs-docker mwext-php70-phan-docker mwgate-npm-node-6-docker mwgate-tox-docker npm-node-6-docker operations-puppet-tests-docker operations-puppet-wmf-style-guide pywikibot-core-tox-doc-docker pywikibot-core-tox-nose34-docker pywikibot-core-tox-nose-docker search-mjolnir-tox-docker tox-docker Bug: T177684 Depends-On: If9b743fb187cb29e16939a861a8c323a84efed71 Change-Id: Ic596ea957df2a6a8af01b1cbe2b6b27a3551fef2 --- M jjb/castor.yaml M jjb/job-templates.yaml M jjb/macro-docker.yaml M jjb/mediawiki-extensions.yaml M jjb/mediawiki.yaml M jjb/operations-puppet.yaml M jjb/php.yaml M jjb/python-jobs.yaml M jjb/r-jobs.yaml 9 files changed, 7 insertions(+), 53 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/castor.yaml b/jjb/castor.yaml index 541cc47..b6a6c27 100644 --- a/jjb/castor.yaml +++ b/jjb/castor.yaml @@ -64,7 +64,7 @@ - shell: | echo "Clearing $WORKSPACE/cache" exec docker run --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "$(pwd)"/cache:/cache \ 'wmfreleng/castor:v2017.10.30.21.03' clear || : # nothing else can be executed due to exec @@ -89,9 +89,8 @@ builders: - docker-cache-dir - shell: | - /usr/bin/env > .env exec docker run --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "${WORKSPACE}/cache":/cache \ wmfreleng/castor:v2017.10.30.21.03 \ load diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index d4f7c5b..a9c885c 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -170,7 +170,6 @@ triggers: - zuul builders: - - docker-zuul-env - docker-src-dir - docker-log-dir - docker-cache-dir diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml index 876dac4..01b5387 100644 --- a/jjb/macro-docker.yaml +++ b/jjb/macro-docker.yaml @@ -1,38 +1,3 @@ -# Build a .env file with ZUUL environment -# variables for use with docker -- builder: - name: docker-zuul-env - builders: - - shell: | - #!/bin/bash -e - - set -x - - rm -rf .env - - cat <<ZUUL > .env - ZUUL_URL=$ZUUL_URL - ZUUL_PROJECT=$ZUUL_PROJECT - ZUUL_COMMIT=$ZUUL_COMMIT - ZUUL_REF=$ZUUL_REF - ZUUL_BRANCH=$ZUUL_BRANCH - ZUUL_CHANGES=$ZUUL_CHANGES - ZUUL_CHANGE_IDS=$ZUUL_CHANGE_IDS - ZUUL_CHANGE=$ZUUL_CHANGE - ZUUL_PATCHSET=$ZUUL_PATCHSET - ZUUL_VOTING=$ZUUL_VOTING - ZUUL_PIPELINE=$ZUUL_PIPELINE - ZUUL_UUID=$ZUUL_UUID - EXT_NAME=$EXT_NAME - SKIN_NAME=$SKIN_NAME - EXT_DEPENDENCIES=$EXT_DEPENDENCIES - SKIN_DEPENDENCIES=$SKIN_DEPENDENCIES - JENKINS_URL=$JENKINS_URL - ZUUL - - # Finally, output for debugging help - cat .env - # Create a log directory that will be # mounted into a container with --volume - builder: @@ -68,7 +33,7 @@ set -x exec docker run \ --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "$(pwd)"/log:{logdir} \ {image} # nothing else can be executed due to exec @@ -88,7 +53,7 @@ set -x exec docker run \ --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "$(pwd)"/log:{logdir} \ --volume "$(pwd)"/cache:/cache \ {image}{obj:run_args|} @@ -119,7 +84,7 @@ set -x exec docker run \ --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "$(pwd)"/src:/src \ --volume "$(pwd)"/cache:/cache \ --volume /srv/git:/srv/git \ @@ -137,7 +102,7 @@ set -x exec docker run \ --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "$(pwd)"/src:/src \ --volume "$(pwd)"/cache:/cache \ --volume /srv/git:/srv/git \ diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index a1cbb6d..f6b7cca 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -390,7 +390,6 @@ - docker-log-dir - docker-src-dir - docker-cache-dir - - docker-zuul-env - docker-ci-src-setup-mwext - shell: | #!/bin/bash -eu diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 675a7c1..ab0f438 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -405,7 +405,6 @@ triggers: - zuul builders: - - docker-zuul-env - docker-log-dir - docker-src-dir - docker-cache-dir @@ -435,13 +434,12 @@ - docker-log-dir - docker-src-dir - docker-cache-dir - - docker-zuul-env - shell: | #!/bin/bash -eu set -x exec docker run \ --rm \ - --env-file .env \ + --env-file <(/usr/bin/env) \ --volume "$(pwd)"/src:/src \ --volume "$(pwd)"/cache:/cache \ --volume /srv/git:/srv/git \ diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml index b5848eb..f4c329c 100644 --- a/jjb/operations-puppet.yaml +++ b/jjb/operations-puppet.yaml @@ -51,7 +51,6 @@ triggers: - zuul builders: - - docker-zuul-env - docker-log-dir - docker-run-with-log: image: 'docker-registry.wikimedia.org/releng/operations-puppet:0.1.0' diff --git a/jjb/php.yaml b/jjb/php.yaml index dba2366..f4030c8 100644 --- a/jjb/php.yaml +++ b/jjb/php.yaml @@ -137,7 +137,6 @@ triggers: - zuul builders: - - docker-zuul-env - docker-log-dir - docker-src-dir - docker-cache-dir @@ -156,7 +155,6 @@ triggers: - zuul builders: - - docker-zuul-env - docker-log-dir - docker-src-dir - docker-cache-dir diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml index 0037750..b9a662f 100644 --- a/jjb/python-jobs.yaml +++ b/jjb/python-jobs.yaml @@ -73,7 +73,6 @@ - zuul builders: - docker-castor-load - - docker-zuul-env - docker-log-dir - docker-run-with-log-and-workspace-cache: image: '{obj:docker_image_var}' @@ -100,7 +99,6 @@ - zuul builders: - docker-castor-load - - docker-zuul-env - docker-log-dir - docker-run-with-log-and-workspace-cache: image: 'wmfreleng/tox:v2017.11.10.21.35' diff --git a/jjb/r-jobs.yaml b/jjb/r-jobs.yaml index f4ada34..5cc7001 100644 --- a/jjb/r-jobs.yaml +++ b/jjb/r-jobs.yaml @@ -6,7 +6,6 @@ triggers: - zuul builders: - - docker-zuul-env - docker-log-dir - docker-run-with-log: image: 'wmfreleng/lintr:v2017.09.27.10.45' -- To view, visit https://gerrit.wikimedia.org/r/392633 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic596ea957df2a6a8af01b1cbe2b6b27a3551fef2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits