Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/129661
Change subject: Refactor UploadWizard-API job to use a single template
......................................................................
Refactor UploadWizard-API job to use a single template
We have two UploadWizard api tests:
UploadWizard-api-commons.wikimedia.org
UploadWizard-api-commons.wikimedia.beta.wmflabs.org
This patch makes the template to vary based on the mediawiki_url
parameter. Depending on its value, use a different username and a
different password variable to match the (username, mediawiki_url).
I removed the PollScm variance in the production job. Was apparently
meant to run the job at 5:31am every day. But we already trigger it
twice per day so I dont think that is needed.
Change-Id: I595debcefbd1c53b503a4fc7e197a451367d4c5e
---
M job_template.yaml
M jobs.yaml
2 files changed, 25 insertions(+), 23 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config
refs/changes/61/129661/1
diff --git a/job_template.yaml b/job_template.yaml
index a635ee9..b6b940f 100644
--- a/job_template.yaml
+++ b/job_template.yaml
@@ -53,9 +53,8 @@
# UploadWizard
- job-template:
- name: 'UploadWizard-api-{name}'
+ name: 'UploadWizard-api-{mediawiki_url}'
defaults: browsertests
- mediawiki_password_variable: '{mediawiki_password_variable}'
mediawiki_url: '{mediawiki_url}'
pollscm: '{pollscm}'
@@ -65,9 +64,7 @@
builders:
- UploadWizard-api:
- mediawiki_password_variable: '{mediawiki_password_variable}'
mediawiki_url: '{mediawiki_url}'
- mediawiki_user: '{mediawiki_user}'
publishers:
- email:
@@ -80,7 +77,23 @@
- shell: |
# set up environment variables
set -e
- export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
+
+ case "{mediawiki_url}" in
+ 'commons.wikimedia.beta.wmflabs.org')
+ export
MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
+ export MEDIAWIKI_USER='Selenium_user'
+ ;;
+ 'commons.wikimedia.org')
+ export
MEDIAWIKI_PASSWORD_VARIABLE=MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
+ export MEDIAWIKI_USER='Selenium_user'
+ ;;
+ *)
+ echo "Can not determine username and password env variable for
{{name}}"
+ echo "Unsupported mediawiki url {{mediawiki_url}}"
+ exit 1
+ ;;
+ esac;
+
# install python
virtualenv --distribute DEV
@@ -90,11 +103,11 @@
# run tests
DEV/bin/python tests/api/upload-wizard_tests.py \
- --username "{mediawiki_user}" \
+ --username "$MEDIAWIKI_USER" \
--api_url "http://{mediawiki_url}/w/api.php";
DEV/bin/python tests/api/upload-wizard_tests.py \
--gen_new_image \
- --username "{mediawiki_user}" \
+ --username "$MEDIAWIKI_USER" \
--api_url "http://{mediawiki_url}/w/api.php";
# VisualEditor
diff --git a/jobs.yaml b/jobs.yaml
index cfbf635..b63402d 100644
--- a/jobs.yaml
+++ b/jobs.yaml
@@ -299,26 +299,15 @@
## API
- project:
- name: commons.wikimedia.beta.wmflabs.org
- mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WMFLABS_ORG
- mediawiki_url: commons.wikimedia.beta.wmflabs.org
- mediawiki_user: Selenium_user
+ name: UploadWizard-api
+ mediawiki_url:
+ - commons.wikimedia.beta.wmflabs.org
+ - commons.wikimedia.org
pollscm: '* * * * *'
repository: mediawiki/extensions/UploadWizard
jobs:
- - 'UploadWizard-api-{name}'
-
-- project:
- name: commons.wikimedia.org
- mediawiki_password_variable: MEDIAWIKI_PASSWORD_SELENIUM_USER_WIKIPEDIA_ORG
- mediawiki_url: commons.wikimedia.org
- mediawiki_user: Selenium_user
- pollscm: '0 5 31 2 *'
- repository: mediawiki/extensions/UploadWizard
-
- jobs:
- - 'UploadWizard-api-{name}'
+ - 'UploadWizard-api-{mediawiki_url}'
## commons.wikimedia.beta.wmflabs.org
--
To view, visit https://gerrit.wikimedia.org/r/129661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I595debcefbd1c53b503a4fc7e197a451367d4c5e
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: cloudbees
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
