jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392480 )
Change subject: Revert "Pass env to docker run"
......................................................................
Revert "Pass env to docker run"
/usr/bin/env is only being passed exported variables.
This reverts commit 244069ad2b425781bd0e3b680ba18da614171f6b.
Change-Id: I824a51b9cbc3cf3578228b71c761baf300b58db0
---
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, 53 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index b6a6c27..541cc47 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -64,7 +64,7 @@
- shell: |
echo "Clearing $WORKSPACE/cache"
exec docker run --rm \
- --env-file <(/usr/bin/env) \
+ --env-file .env \
--volume "$(pwd)"/cache:/cache \
'wmfreleng/castor:v2017.10.30.21.03' clear || :
# nothing else can be executed due to exec
@@ -89,8 +89,9 @@
builders:
- docker-cache-dir
- shell: |
+ /usr/bin/env > .env
exec docker run --rm \
- --env-file <(/usr/bin/env) \
+ --env-file .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 a9c885c..d4f7c5b 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -170,6 +170,7 @@
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 fe30b26..d5bcf1f 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -1,3 +1,38 @@
+# 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:
@@ -33,7 +68,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file .env \
--volume "$(pwd)"/log:{logdir} \
{image}
# nothing else can be executed due to exec
@@ -53,7 +88,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file .env \
--volume "$(pwd)"/log:{logdir} \
--volume "$(pwd)"/cache:/cache \
{image}{obj:run_args|}
@@ -84,7 +119,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file .env \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
@@ -102,7 +137,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file .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 f6b7cca..a1cbb6d 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -390,6 +390,7 @@
- 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 5076f58..cea9af7 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -405,6 +405,7 @@
triggers:
- zuul
builders:
+ - docker-zuul-env
- docker-log-dir
- docker-src-dir
- docker-cache-dir
@@ -434,12 +435,13 @@
- docker-log-dir
- docker-src-dir
- docker-cache-dir
+ - docker-zuul-env
- shell: |
#!/bin/bash -eu
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file .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 f4c329c..b5848eb 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -51,6 +51,7 @@
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 f4030c8..dba2366 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -137,6 +137,7 @@
triggers:
- zuul
builders:
+ - docker-zuul-env
- docker-log-dir
- docker-src-dir
- docker-cache-dir
@@ -155,6 +156,7 @@
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 b9a662f..0037750 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -73,6 +73,7 @@
- zuul
builders:
- docker-castor-load
+ - docker-zuul-env
- docker-log-dir
- docker-run-with-log-and-workspace-cache:
image: '{obj:docker_image_var}'
@@ -99,6 +100,7 @@
- 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 5cc7001..f4ada34 100644
--- a/jjb/r-jobs.yaml
+++ b/jjb/r-jobs.yaml
@@ -6,6 +6,7 @@
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/392480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I824a51b9cbc3cf3578228b71c761baf300b58db0
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
