Vikassy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/156138
Change subject: Environment variable MEDIAWIKI_API_UPLOAD_URL can now be set
using build parameter in language screenshot job
......................................................................
Environment variable MEDIAWIKI_API_UPLOAD_URL can now be set using build
parameter in language screenshot job
Change-Id: I36af29c1b240d598b5f4ca8c23960f495fae651c
---
M jobs.yaml
M macro.yaml
2 files changed, 6 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/38/156138/1
diff --git a/jobs.yaml b/jobs.yaml
index a4f0466..5562c8d 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -348,6 +348,11 @@
browser: firefox
mediawiki_password_variable:
MEDIAWIKI_PASSWORD_LANGUAGESCREENSHOTBOT_WMFLABS_ORG
mediawiki_user: LanguageScreenshotBot
+ parameters:
+ - string:
+ name: MEDIAWIKI_API_UPLOAD_URL
+ default: https://commons.wikimedia.org/w/api.php
+ description: "Upload API URL for uploading screenshots"
# WikiLove
- project:
diff --git a/macro.yaml b/macro.yaml
index 6bb83c1..d077548 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -97,8 +97,7 @@
--tags @$BROWSER_TAG \
|| (echo -e "\nJob has failed (exit code: $?)."; false)
- if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
- export
MEDIAWIKI_API_UPLOAD_URL=https://commons.wikimedia.org/w/api.php
+ if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]] && [[ ! -z
$MEDIAWIKI_API_UPLOAD_URL ]]; then
"$WORKSPACE"/vendor/bin/bundle exec ruby1.9.1 upload.rb
fi
--
To view, visit https://gerrit.wikimedia.org/r/156138
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36af29c1b240d598b5f4ca8c23960f495fae651c
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Vikassy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
