Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/165461
Change subject: Use templates for all Wikidata jobs ...................................................................... Use templates for all Wikidata jobs Some jobs require tests with specific tags to be executed. For this to work I needed to introduce another parameter to specify custom tags. Called it cucumber_tags. If it is not set everything behaves as before. If it is set, only tests with the specified tags will be executed. Change-Id: I7d7e528024c849b939cb5b00a2d522ec39d50ff1 --- M browsertests.yaml M job-templates-browsertests.yaml M macro.yaml 3 files changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/61/165461/1 diff --git a/browsertests.yaml b/browsertests.yaml index 1f7ac2e..9b3f4ab 100644 --- a/browsertests.yaml +++ b/browsertests.yaml @@ -528,7 +528,15 @@ repository_host: github.com/wmde jobs: - - 'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce' + - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce' + + - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce': + name: PerformanceTests + cucumber_tags: '@performance_testing' + + - 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce': + name: SmokeTests + cucumber_tags: '@smoke' # WikiLove - project: diff --git a/job-templates-browsertests.yaml b/job-templates-browsertests.yaml index 2da78b1..39ffd04 100644 --- a/job-templates-browsertests.yaml +++ b/job-templates-browsertests.yaml @@ -68,7 +68,7 @@ - lang_list - job-template: - name: 'browsertests-Wikidata-{name}-{mediawiki_url}-{platform}-{browser}-sauce' + name: 'browsertests-Wikidata-{name}-{platform}-{browser}-sauce' defaults: browsertests triggers: @@ -78,6 +78,7 @@ name: browsertests node: contintLabsSlave && UbuntuPrecise repository_host: 'gerrit.wikimedia.org/r' + cucumber_tags: '' properties: - throttle: @@ -104,6 +105,7 @@ - shell: mkdir -p "$WORKSPACE/log/junit" - browsertest-website: browser: '{browser}' + cucumber_tags: '{cucumber_tags}' headless: '{headless}' folder: '{folder}' mediawiki_password_variable: '{mediawiki_password_variable}' diff --git a/macro.yaml b/macro.yaml index dbbd7eb..6598b91 100644 --- a/macro.yaml +++ b/macro.yaml @@ -627,6 +627,7 @@ - shell: | # set up environment variables export BROWSER={browser} + export CUCUMBER_TAGS={cucumber_tags} export HEADLESS={headless} export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable} @@ -706,6 +707,8 @@ export LANGUAGE_SCREENSHOT_PATH="$WORKSPACE/log" elif [[ $JOB_NAME == browsertests-Core-* ]]; then CUCUMBER_PARAMETER="@clean" + elif [[ ! -z $CUCUMBER_TAGS ]]; then + CUCUMBER_PARAMETER="$CUCUMBER_TAGS" else CUCUMBER_PARAMETER="@{mediawiki_url}" fi -- To view, visit https://gerrit.wikimedia.org/r/165461 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d7e528024c849b939cb5b00a2d522ec39d50ff1 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits