Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399532 )
Change subject: Do not pass HHVM_REPO_CENTRAL_PATH to Docker
......................................................................
Do not pass HHVM_REPO_CENTRAL_PATH to Docker
HHVM_REPO_CENTRAL_PATH is set centrally in Jenkins to point to the build
workspace. That does not make sense inside a container, so strip it
off.
The HHVM container have a .ini and HHVM_REPO_CENTRAL_PATH env variable
set properly.
Update all -docker jobs.
Bug: T183324
Change-Id: I9d9b5c28ec3de4e41908833272349d16b41a067f
---
M jjb/castor.yaml
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/32/399532/1
diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index f0f0925..3988923 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|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/cache:/cache \
'docker-registry.wikimedia.org/releng/castor:0.1.3'
clear || :
# nothing else can be executed due to exec
@@ -90,7 +90,7 @@
- docker-cache-dir
- shell: |
exec docker run --rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "${WORKSPACE}/cache":/cache \
docker-registry.wikimedia.org/releng/castor:0.1.3 \
load
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 61b186b..352b74d 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -46,7 +46,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/log:{logdir} \
{image}
# nothing else can be executed due to exec
@@ -66,7 +66,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/log:{logdir} \
--volume "$(pwd)"/cache:/cache \
{image}{obj:run_args|}
@@ -82,7 +82,7 @@
chmod 2777 src
exec docker run \
--rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/log:{logdir} \
--volume "$(pwd)"/cache:/cache \
--volume "$(pwd)"/src:/src \
@@ -98,7 +98,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
@@ -116,7 +116,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 6235a03..f408d26 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -431,7 +431,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL|HHVM_REPO_CENTRAL_PATH)=') \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
--
To view, visit https://gerrit.wikimedia.org/r/399532
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d9b5c28ec3de4e41908833272349d16b41a067f
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
