jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403632 )
Change subject: Clean out rake-jessie legacy bits
......................................................................
Clean out rake-jessie legacy bits
The last use case is mediawiki/vagrant.
* remove the template and directly use a job
* rename a variable in tests
* delete 'rake-jessie'
* update zuul jobs matchers to drop -jessie
Change-Id: I5ac1ad8e2b66fb699d1d5baed326ea30a7ef2369
---
M jjb/mediawiki-misc.yaml
M jjb/ruby-jobs.yaml
M tests/test_zuul_scheduler.py
M zuul/layout.yaml
4 files changed, 20 insertions(+), 29 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/mediawiki-misc.yaml b/jjb/mediawiki-misc.yaml
index c173652..b555975 100644
--- a/jjb/mediawiki-misc.yaml
+++ b/jjb/mediawiki-misc.yaml
@@ -30,13 +30,27 @@
- '{name}-bundle-yard-publish'
- '{name}-rake-docker'
+# Run `bundle exec rake test` on Nodepool Jessie instances.
+- job:
+ name: 'mediawiki-vagrant-rake-jessie'
+ node: ci-jessie-wikimedia
+ defaults: use-remote-zuul-shallow-clone
+ concurrent: true
+ triggers:
+ - zuul
+ builders:
+ - castor-load
+ - bundle-nodepool:
+ command: rake test
+ publishers:
+ - castor-save
+
- project:
name: 'mediawiki-vagrant'
jobs:
- '{name}-rake-docker':
docker_image_var:
docker-registry.wikimedia.org/releng/rake-vagrant:0.2.0
build_timeout: 10 # minutes
- - '{name}-rake-jessie'
- 'mediawiki-vagrant-puppet-doc-publish'
- project:
diff --git a/jjb/ruby-jobs.yaml b/jjb/ruby-jobs.yaml
index 460db01..7af5fa4 100644
--- a/jjb/ruby-jobs.yaml
+++ b/jjb/ruby-jobs.yaml
@@ -35,33 +35,10 @@
triggers:
- zuul
-# Run `bundle exec rake test` on Nodepool Jessie instances.
-- job: &job_rake-jessie
- name: 'rake-jessie'
- node: ci-jessie-wikimedia
- defaults: use-remote-zuul-shallow-clone
- concurrent: true
- triggers:
- - zuul
- builders:
- - castor-load
- - bundle-nodepool:
- command: rake test
- publishers:
- - castor-save
-
-- job-template:
- !!merge : *job_rake-jessie
- name: '{name}-rake-jessie'
- # Reinject Zuul parameters since JJB strip for some reason
- triggers:
- - zuul
-
- project:
name: common-rake-job
jobs:
- rake-docker
- - rake-jessie
# Call bundle 'yard' to generate documentation in labs and publish to
# doc.wikimedia.org using an intermediate rsync repository in labs.
diff --git a/tests/test_zuul_scheduler.py b/tests/test_zuul_scheduler.py
index 60fd5a2..056db8b 100644
--- a/tests/test_zuul_scheduler.py
+++ b/tests/test_zuul_scheduler.py
@@ -656,7 +656,7 @@
jobs_tree = [t for (p, t) in
self.getPipeline('test').job_trees.iteritems()
if p.name == 'mediawiki/ruby/api'][0]
- rake_jessie_job = [j for j in jobs_tree.getJobs()
+ rake_docker_job = [j for j in jobs_tree.getJobs()
if j.name.endswith('rake-docker')][0]
def change_with_files(files):
@@ -681,11 +681,11 @@
try:
if expect:
self.assertTrue(
- rake_jessie_job.changeMatches(change),
+ rake_docker_job.changeMatches(change),
'rake-docker should run with files: %s' % files)
else:
self.assertFalse(
- rake_jessie_job.changeMatches(change),
+ rake_docker_job.changeMatches(change),
'rake-docker should NOT run with files: %s' % files)
except AssertionError, e:
errors.append(str(e))
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 5dc30c4..aaa8926 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -757,7 +757,7 @@
- '^tox\.ini$'
- - name: ^.*rake-(docker|jessie)$
+ - name: ^.*rake-docker$
files:
# Uses python re.match() which checks at BEGINNING of the string
- '.*\.pp$'
@@ -769,7 +769,7 @@
- name: ^mediawiki-vagrant-rake-(docker|jessie)$
files:
- '.*'
- - name: ^puppet-wmf-styleguide-rake-(docker|jessie)$
+ - name: ^puppet-wmf-styleguide-rake-docker$
files:
- '.*'
--
To view, visit https://gerrit.wikimedia.org/r/403632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5ac1ad8e2b66fb699d1d5baed326ea30a7ef2369
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
