jenkins-bot has submitted this change and it was merged.

Change subject: Make browser tests version '' (empty string) by default
......................................................................


Make browser tests version '' (empty string) by default

SauceLabs grabs the latest version of the browser when no
version is specified. This let us clean a bit our huge shell script.

* Remove switch/case that explicitly set the version per browser.
* Set JJB 'version' variable to default to '' instead of 10, seems it
  was used for IE and every jobs already have a version set explicitly.

This will let us pin a specific version of a browser on a per job basis.
For example Chrome @ v 33 if a repository does not work on later
versions.

Changes all browsertests* jobs.

Change-Id: Id6a8bb62a6884c61862b2890cdf86693e3b56248
---
M jjb/job-templates-browsertests.yaml
M jjb/macro-browsertests.yaml
2 files changed, 2 insertions(+), 33 deletions(-)

Approvals:
  Zfilipin: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/job-templates-browsertests.yaml 
b/jjb/job-templates-browsertests.yaml
index 0922af3..b76a16e 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -67,7 +67,7 @@
     browsertest_job_timeout: 180
     repository_host: 'gerrit.wikimedia.org/r'
     cucumber_tags: ''
-    version: '10'
+    version: ''
 
     logrotate:
         daysToKeep: 31  # ~ 2 * 2 weeks sprints
diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 2d60e37..7b62904 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -37,39 +37,8 @@
           export MEDIAWIKI_PASSWORD_VARIABLE='MEDIAWIKI_PASSWORD'
           set -x
 
-          # We only care about one version of our browser and do not need a job
-          # per version.  Thus the versions to use are hardcoded there.
-          #
           # VERSION is used for SauceLabs
-          #
-          case "$BROWSER" in
-            'android')
-                export VERSION=4.4
-                ;;
-            'chrome')
-                export VERSION=40.0
-                ;;
-            'firefox')
-                export VERSION=35.0
-                ;;
-            'internet_explorer')
-                export VERSION={version}
-                ;;
-            'iphone')
-                export VERSION=8.1
-                ;;
-            'phantomjs')
-                export VERSION=''
-                ;;
-            'safari')
-                export VERSION=7.0
-                ;;
-            *)
-                echo "Browser '$BROWSER' unsupported. Can not determine 
version"
-                exit 1
-                ;;
-          esac
-          echo "Using browser: $BROWSER at version $VERSION"
+          export VERSION={version}
 
           if [ $BROWSER == "internet_explorer" ]
           then

-- 
To view, visit https://gerrit.wikimedia.org/r/200512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6a8bb62a6884c61862b2890cdf86693e3b56248
Gerrit-PatchSet: 6
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to