jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392632 )
Change subject: docker: fix ci-src-setup with unbound variables
......................................................................
docker: fix ci-src-setup with unbound variables
When passing the whole environment to docker run (244069ad2), some jobs
started failling with:
/srv/setup-mwext.sh: line 9: SKIN_DEPENDENCIES: unbound variable
SKIN_DEPENDENCIES is injected by Zuul, that fails though when it is
unset since setup-mwext.sh has `set -u`.
Adjust ci-src-setup/example-run.sh, it was setting SKIN_DEPENDENCIES to
workaround the issue. Turned out to be a real problem.
Default EXT_DEPENDENCIES and SKIN_DEPENDENCIES to an empty string when
they are not set/null.
Update jobs:
mediawiki-core-php70-phan-docker
mwext-php70-phan-docker
Bug: T177684
Change-Id: If9b743fb187cb29e16939a861a8c323a84efed71
---
M dockerfiles/ci-src-setup/example-run.sh
M dockerfiles/ci-src-setup/setup-mwext.sh
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
4 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/ci-src-setup/example-run.sh
b/dockerfiles/ci-src-setup/example-run.sh
index bca7c90..8493e0e 100644
--- a/dockerfiles/ci-src-setup/example-run.sh
+++ b/dockerfiles/ci-src-setup/example-run.sh
@@ -7,7 +7,6 @@
--env ZUUL_COMMIT=d016986bda3bec88bf246fa5c34be2941c54ba70 \
--env ZUUL_REF=refs/changes/08/371108/4 \
--env EXT_DEPENDENCIES=mediawiki/extensions/BetaFeatures \
- --env SKIN_DEPENDENCIES= \
--entrypoint "bash" \
wmfreleng/ci-src-setup:latest \
- //srv/setup-mw.sh
+ //srv/setup-mwext.sh
diff --git a/dockerfiles/ci-src-setup/setup-mwext.sh
b/dockerfiles/ci-src-setup/setup-mwext.sh
index 9bc162b..2634b9c 100644
--- a/dockerfiles/ci-src-setup/setup-mwext.sh
+++ b/dockerfiles/ci-src-setup/setup-mwext.sh
@@ -5,8 +5,8 @@
umask 002
echo $ZUUL_PROJECT > /tmp/deps.txt
-echo -e $EXT_DEPENDENCIES >> /tmp/deps.txt
-echo -e $SKIN_DEPENDENCIES > /tmp/deps_skins.txt
+echo -e "${EXT_DEPENDENCIES:-}" >> /tmp/deps.txt
+echo -e "${SKIN_DEPENDENCIES:-}" > /tmp/deps_skins.txt
cd /src
@@ -32,7 +32,7 @@
' \;
echo $ZUUL_PROJECT > /tmp/extensions_load.txt
-echo -e $EXT_DEPENDENCIES >> /tmp/extensions_load.txt
+echo -e "${EXT_DEPENDENCIES:-}" >> /tmp/extensions_load.txt
set -u
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index d5bcf1f..876dac4 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -124,7 +124,7 @@
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
--entrypoint "bash" \
- wmfreleng/ci-src-setup:v2017.10.17.09.17 \
+ wmfreleng/ci-src-setup:v2017.11.21.12.57 \
/srv/setup-mwext.sh
# nothing else can be executed due to exec
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index cea9af7..675a7c1 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -446,7 +446,7 @@
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
--entrypoint "bash" \
- wmfreleng/ci-src-setup:v2017.10.17.09.17 \
+ wmfreleng/ci-src-setup:v2017.11.21.12.57 \
/srv/setup-mw.sh
# nothing else can be executed due to exec
- shell: |
--
To view, visit https://gerrit.wikimedia.org/r/392632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9b743fb187cb29e16939a861a8c323a84efed71
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
