Last modified: 2014-09-01 16:44:55 UTC
cloudbees branch was a step in moving jobs from Cloudbees. Now that the move is finished, the branch should be merged with master.
$ git checkout cloudbees $ git checkout -b the_big_merge $ git rebase master First, rewinding head to replay your work on top of it... ...(fixed all conflicts)... $ git review You are about to submit multiple commits. This is expected if you are submitting a commit that is dependent on one or more in-review commits. Otherwise you should consider squashing your changes into one commit before submitting. The outstanding commits are: 64e8d18 (HEAD, the_big_merge) Add job for PageTriage tests 017c8e2 Language screenshot job should run on test2.wikipedia.org 657f627 Add Chrome build for Math extension on beta labs 9ad0a82 Tie language screenshot to UbuntuPrecise 4a70f3f Tie all jobs to UbuntuPrecise 239bbdb The first job for Math extension fc7283c Language screenshot feature file runs only in language screenshot job 64af5d1 Run language screenshot job manually 5f3072b Language screenshot jobs run in serial now 224139e VisualEditor renamed "test" folder to "tests"[1] 69cb80e mediawiki/core Jenkins job should not send e-mail notifications to ULS team 3637bbd Remove mobile-tech from Jenkins notifications 8e51dc8 language-screenshot jobs should use LanguageScreenshotBot user 6637a2a Upload the language screenshots cbc0ff2 Normalize ZeroBanner job 8a57c13 Support setting VERSION for phantomjs browser 90eba50 Tests moved from ZeroRatedMobileAccess to ZeroBanner repository c85965f WikiLove job runs at Sauce Labs d322815 Moved mediawiki_user variable from jobs section to project section 9254600 Running all CirrusSearch jobs at Sauce Labs 95d9d29 Moved mediawiki_user variable from jobs section to project section e553524 Deleted CentralAuth job dcce7bf browsertests: matrix project to take screenshots 313ca1d Deleted browsertests jobs, created Flow jobs 2658ea7 Created the first job to run Selenium tests in mediawiki/core 158770b Moved MultimediaViewer jobs from Cloudbees dce5026 Moved two browsertests-qa jobs to Sauce Labs 522a666 Moved a couple of UploadWizard from Cloudbees e75d259 All language team jobs are now running at Sauce Labs 56263c9 Deleted en.m.wikipedia.org MobileFrontend job 9f6397d Moved the last two MobileFrontend jobs from Cloudbees 88a2f1b Replace underscore by spaces in PLATFORM f3947d7 Moved the last VisualEditor job from Cloudbees 53bf24c Created the first Windows XP job 23be398 Created a couple of VisualEditor test2.wikipedia.org jobs ad0ccfa Refactored Flow, MobileFrontend and VisualEditor Sauce Labs jobs. Deleted local VisualEditor jobs. 52561f5 Deleted local MobileFrontend jobs, refactored MobileFrontend Sauce Labs jobs 8d65d8b Deleted two local Flow jobs, created two Flow jobs that run on Sauce Labs 982f9df Disable MF/VE jobs moved to SauceLabs 64cb2bf Sauce jobs for MobileFrontend de563e1 Chrome job for VisualEditor on en.beta b09d3ec Add support to pass VERSION for Chrome browsers 62ca809 Create a -sauce template with headless set to false 745ce86 Make headless a JJB variable 427054b Let us manage disable manually 8d3943c Disable all browsertests jobs f775cd1 Adjust node label 7edd9c8 Notify qa-alerts@lists.wikimedia.org ee18913 Reset branch based on origin, not local copy 67cd040 Fallback to master branch when test repo miss branch 08a04ae Get mw branch from target URL and check it out 249dfc4 Allow user to claim failed build 5ef9dca Refactor UploadWizard API template to use mediawiki_url 28c4f1f Refactor job template to include mediawiki_url 54855f7 Add Screenshots for ZeroRatedMobileAccess 2f66f2b browsertests: Change irc message-type from summary-scm to summary 2bf9cd6 Export MEDIAWIKI_API_URL when running browser tests ea0d30d ZeroRatedMobileAccess had a cloudbees phantomjs install 5e1b510 Normalize user/pass for language-stage instance 2f153ee Normalize user/pass for language-browsertests instance 4c70068 Prefix the two qa/browsertests jobs with 'qa-' b82a2b1 Make the job templates to vary by platform 65031b2 Make platform all lower case 2d0df48 Vary VisualEditor and ZeroRatedMobileAccess by browser 671ecd7 Restore WikiLove job! 76f83f6 Drop version parameter entirely 906e611 Make the job template to vary by browser 5b55a1b Rename build 'default' to 'browsertest-website' e5ae11d Rename default to 'browsertest' f397f8e Use YAML anchors and alias to maintain emails lists db84dab Write junit report under /log/junit/ 937cf75 Explode a long line in ZeroRatedMobileAccess 50b487b Make sure we have a '/log' directory ff4f8c1 Split long line into several shorter ones d8c842d Tweak git scm to keep the workspace between build c14ab86 Avoid error when creating vendor directory 4919d45 Take a screenshot when a test fails a694a43 Moved wikimedia.template to integration/jenkins repository 2e92f77 Only notify #wikimedia-qa for browsertests results 3232e6a Deleted job templates that are no longer used 0b2a346 Added "browsertests-" to the beginning of every job 842ad50 Deleting all Internet Explorer and Chrome jobs 86e6897 Force cucumber to use colors f73b76f Run browser tests on the local machine headlessly 5cf4441 Add timestamp and ansicolor to the console 98b95c9 Make the ircbot publisher a macro 2587d22 Use gem 1.9.3 and the installed bundler version 59c668b Make bundle install verbose! 3475b4d Install gems in a shared dir e94c1d1 Remove ruby 2.1.1 when running on wmflabs b3ba732 Tie browsertests jobs to wmflabs slaves 1d617b8 .gitreview file for the cloudbees branch 60e446b Created CentralAuth job 85842ef Replaced browser_version JJB variable with BROWSER_TAG shell variable c643972 Added browser specific tags to ContentTranslation Cucumber feature 72d9905 Fixed browser for several Jenkins jobs c707fa2 Added per-browser tags to MobileFrontend builds 86a33c7 Renamed a couple of Flow jobs to follow the convention d78c52b Added browser specific tags to Cucumber features and scenarios 4f17984 Update Chrome at Sauce Labs to the most stable version f65462a Change recipient for MultimediaViewer alerts 1d66ec9 Fixed username and password for a Translate job 3c0a9d5 Merged default and browsertests dcm section a72ae6d Refactored shell builders 7c77449 Refactoring: grouped job templates and builders b8fa80d Moved UploadWizard job template to the template file, and jobs to jobs file ecbf4e0 Refactored VisualEditor job to use job template bbc1072 Refactored Zero job to use the job template 1e14b88 Moved browsertests to the bottom of the file 82a7254 Refactored an ULS job to use the template aef3275 Rename user for CX to TranslatorToDa 113b5e5 Created the first ContentTranslation job 5974b36 Documented Extended E-mail Notification plugin setup f58e24e Minor formatting improvements for Jenkins documentation 217f6b0 Moved environment variables above IRC notification d921f3c Renamed e-mail template file so it has the same name as at Cloudbees e059c36 Moved Jenkins documentation from mediawiki/selenium[1] repository 2cb2c9c Using new e-mail notifications c846509 Sending MobileFrontend e-mail notifications to mobile-tech dfb6b01 Removed myself from all Jenkins e-mail notifications ba130d0 Removed Jeff from all e-mail notifications a16b4fb Fixed Translate jobs a908cc9 Updated Ruby version from 2.1.0 to 2.1.1 ec8ef0f Add the whole eng MM team to the recipient list of UW test failures bd6391a added browsertests-test2.wikipedia.org jobs 3466d51 added browsertests-en.wikipedia.beta.wmflabs.org jobs abb996e refactoring: moved everything from default job template to defaults a72ac64 refactoring: moved disabled and triggers from job template to defaults 46aa64d refactoring: extracted scm out of job template 5467697 refactoring: extracted publishers out of job template 7e78369 refactoring: extracted shell builder out of job template 3baf71e Added the rest of UploadWizard jobs c6a2145 added "api-" to names of UploadWizard API jobs a6ff524 Added missing "-windows" to Flow IE job names ff68e9a added remaining UniversalLanguageSelector jobs d596706 Spread load evenly b5a13f6 Updated UniversalLanguageSelector and VisualEditor jobs c12b00b added Translate jobs 4900cbd added comments, where the jobs run 0ea737b Fixed mediawiki_url for test2 Flow jobs 9478a96 PLATFORM environment variable should be quoted 19a9888 added Flow jobs aabbe80 added MobileFrontend jobs 3748443 Separated repositories with comments 71c909f Add the whole eng MM team to the recipient list of e2e test failures 3cdf7c5 Added TwnMainPage job 2e76c52 ZeroRatedMobileAccess does not need to fetch a commit from Gerrit any more 7bac79e added MultimediaViewer job e5824fe Sorted job variables alphabetically 5e9d306 Spreading load evenly eacd407 added CirrusSearch jobs 87c4b66 moved job template and jobs to separate files b920181 shorter file names a472a19 deleted unused job 8106cde one job template to rule them all fdc8cfe VisualEditor and WikiLove are using the same job template 3a992de yaml file for the first UniversalLanguageSelector job ac6ad09 Merged UploadWizard yaml files into one ab4f0fe Created one VisualEditor job template to rule them all 6a27177 Combined two VisualEditor jobs into one file 86a78ea Make sure the job does not fail if phantoms is not already installed bedc0f3 yaml file for ZeroRatedMobileAccess 93fe2b6 yaml file for WikiLove-en.wikipedia.beta.wmflabs.org-linux-firefox 376ca73 yaml file for VisualEditor-test2.wikipedia.org-linux-firefox 0f3dcb5 forgot junit publisher bfaa8d3 yaml file for VisualEditor-test2.wikipedia.org-linux-chrome 7705392 looks like James was not receiving some e-mail messages 6154a38 yaml file for VisualEditor-en.wikipedia.beta.wmflabs.org-linux-firefox 8dad741 make it explicit that the job should care just about master branch 7f82e70 yaml file for VisualEditor-en.wikipedia.beta.wmflabs.org-linux-chrome 9f05512 yaml file for VisualEditor-production.wikimedia.org a6fd55e yaml file for UploadWizard-commons.wikimedia.org 777b7ca config file for UploadWizard-commons.wikimedia.beta.wmflabs.org job 1f0359a Updated readme file with basic informatioin f9f9a0d Installing PhantomJS using the latest advice from Cloudbees support 5a2b6af Ported free-style job to jenkins-job-builder d736f27 Initial commit Do you really want to submit the above commits? Type 'yes' to confirm, other to cancel: Aborting.
Antoine, is the the way to go? Or is there a better way?
Change 152905 had a related patch set uploaded by Hashar: Merge cloudbees branch into master https://gerrit.wikimedia.org/r/152905
Here what I did: git remote update git checkout master git reset --hard gerrit/master git merge --no-ff gerrit/cloudbees # fix conflict git push gerrit HEAD:refs/for/master I think the issue was when using git rebase. That create new commits that Gerrit does not know about. git merge --no-ff prevents the rebase and thus keep all the commits from cloudbees branch as is.
Change 152905 abandoned by Hashar: Merge cloudbees branch into master Reason: Was merely to highlight how to handle the merge with git. Will revisit when Zeljkof is back from vacations. https://gerrit.wikimedia.org/r/152905
I might have attempted this merge, but I proved to myself yesterday that I still don't understand jjb well enough to do this with confidence.
Resolved in https://gerrit.wikimedia.org/r/#/c/156809/
