jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/356413 )
Change subject: Cleaned up Ruby jobs ...................................................................... Cleaned up Ruby jobs Only deleted unsed yaml. No jobs have been changed. Bug: T164479 Change-Id: Ie985fe7991f1341c910e39ceb1d89525234470a6 --- D jjb/job-templates-browsertests.yaml M jjb/ruby-jobs.yaml 2 files changed, 0 insertions(+), 161 deletions(-) Approvals: Etonkovidova: Looks good to me, but someone else must approve Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/jjb/job-templates-browsertests.yaml b/jjb/job-templates-browsertests.yaml deleted file mode 100644 index 91b3a2e..0000000 --- a/jjb/job-templates-browsertests.yaml +++ /dev/null @@ -1,105 +0,0 @@ -# default - -- defaults: - name: browsertests - node: contintLabsSlave && UbuntuTrusty - browser_timeout: 120 - browsertest_job_timeout: 180 - repository_host: 'gerrit.wikimedia.org/r' - cucumber_tags: '' - version: '' - - properties: - - build-discarder: - days-to-keep: 31 # ~ 2 * 2 weeks sprints - - scm: - - git: - url: https://{repository_host}/{repository} - branches: - - master - wipe-workspace: false # keep the workspace... - clean: - after: true # ... and use git clean instead - prune: true # prune remote obsoletes branches - submodule: - recursive: true - - triggers: - - timed: "@daily" - - builders: - - shell: mkdir -p "$WORKSPACE/log/junit" - - browsertest-website: - browser: '{browser}' - browser_timeout: '{browser_timeout}' - cucumber_tags: '{cucumber_tags}' - headless: '{headless}' - folder: '{folder}' - mediawiki_credentials_id: '{mediawiki_credentials_id}' - mediawiki_url: '{mediawiki_url}' - name: '{name}' - platform: '{platform}' - version: '{version}' - - publishers: - - junit: - results: 'log/junit/*.xml' - - - email-ext: - recipients: '{recipients}' - body: '${{SCRIPT, template="wikimedia.template"}}' - - - browsertests-irc - - - claim-build - - - performance: - failed-threshold: -1 - unstable-threshold: -1 - report: - - junit: log/junit/*.xml - - - archive: - artifacts: 'log/*.log, log/junit/*.xml, log/report.html, log/*.png' - - - postbuildscript: - builders: - - shell: | - set +e - set +x - echo "Removing potential png screenshots under /log/" - rm -v -f log/*.png || : - echo "Done" - # Postbuild options are confusing, setting both to false ensures the script always runs. - onsuccess: False - onfailure: False - - wrappers: - - ansicolor - - timeout: - timeout: '{browsertest_job_timeout}' - - timestamps - # Wiki usernames and passwords are hold in Jenkins credentials store - # https://integration.wikimedia.org/ci/credential-store/domain/browsertests/ - - credentials-binding: - - username-password: - credential-id: '{mediawiki_credentials_id}' - # FIXME JJB does not support splitted user/pass variables although the plugin does. - # http://ci.openstack.org/jenkins-job-builder/wrappers.html#wrappers.credentials-binding - # Pass both in a single variable, separated by ':' - variable: MEDIAWIKI_CREDENTIALS - # For GettingStarted T91220 - - text: - credential-id: 'mediawiki_captcha_password' - # Feeds into registration_page.rb in GettingStarted; allows - # account creation during browser test - variable: MEDIAWIKI_CAPTCHA_BYPASS_PASSWORD - # For browsertests-Wikidata* jobs, T89343 - - text: - credential-id: wikibase_repo_password - variable: WB_REPO_PASSWORD - # For all browsertests*sauce jobs, T89342 - - text: - credential-id: sauce_ondemand_access_key - variable: SAUCE_ONDEMAND_ACCESS_KEY diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml index 30d61f4..c2dabbc 100644 --- a/jjb/ruby-jobs.yaml +++ b/jjb/ruby-jobs.yaml @@ -1,43 +1,3 @@ -# Executes a Gem command via Bundler, allowing for some additional options -# -# - initialization: Shell script to source before doing anything -# - bundler-version: Version of Bundler to install/use. Defaults to the latest. -# - dir: Working directory for Bundler execution -# - command: Gem/Bundler command to run -# -- builder: - name: bundle-with-options - builders: - - shell: | - # Change to the given working directory - cd "{dir}" - - # Source any given initialization script - if [ ! -z '{initialization}' ]; then - . '{initialization}' - fi - - # Shared cache of gems to avoid hitting rubygems all the time - # See https://github.com/bundler/bundler/issues/2856 - export GEM_HOME="$HOME/.gem/2.0.0" - - # Install bundler - if [ '{bundler-version}' != '' ]; then - version=(-v '{bundler-version}') - else - version=() - fi - - mkdir -p vendor - gem2.0 install --env-shebang -i vendor --no-document "${{version[@]}}" bundler - - # Prepare some paths lookup - export GEM_PATH="`pwd`/vendor" - - # Install dependencies - vendor/bin/bundle install --verbose - vendor/bin/bundle exec {command} - - builder: name: bundle-nodepool builders: @@ -91,22 +51,6 @@ docdest: 'rubygems/{name}' publishers: - castor-save - -- job-template: - name: '{name}-bundle17-yard-publish' - node: contintLabsSlave && UbuntuTrusty - defaults: use-remoteonly-zuul - triggers: - - zuul - builders: - - bundle-with-options: - initialization: '' - command: 'yard' - dir: '.' - bundler-version: '< 1.8.0' - - doc-publish: - docsrc: 'doc' - docdest: 'rubygems/{name}' # General MW-Selenium job used to dogfood the builder against MW core. - job: -- To view, visit https://gerrit.wikimedia.org/r/356413 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie985fe7991f1341c910e39ceb1d89525234470a6 Gerrit-PatchSet: 5 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> Gerrit-Reviewer: Etonkovidova <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
