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

Change subject: typos job template can no vary
......................................................................


typos job template can no vary

The operations-puppet-typos job is quite useful and we would like to get
a similar job to run on operations/mediawiki-config.  Adjust the job
template so it can use different a prefix.

Change is a noop.

Bug: T133047
Change-Id: Ia3d5687f4c29bb83571b5a9bd89f6ba003afd2cd
---
M jjb/misc.yaml
M jjb/operations-puppet.yaml
2 files changed, 46 insertions(+), 46 deletions(-)

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



diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 6540f7d..38799bd 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -290,6 +290,51 @@
       - webpagetest-irc
       - workspace-cleanup
 
+# Find out common typos in any files based on list of typos in a /typos file
+- job-template:
+    name: '{name}-typos'
+    # Bound to Trusty since we need grep v2.11-8 for -r to not follow symlinks
+    node: contintLabsSlave && UbuntuTrusty
+    defaults: use-remote-zuul-shallow-clone
+    concurrent: true
+
+    triggers:
+     - zuul
+
+    builders:
+     - shell: |
+        #!/bin/bash -e
+        echo "Looking potential typos from '/typos' file"
+
+        # Ignore grep errors, we handle them manually
+        set +e
+            # -r does not follow symlinks
+            (fgrep -r --color=always --file=typos --exclude=typos *)
+            ERR="$?"
+        set -e
+
+        # The grep utility exits with one of the following values:
+        #
+        # 0     One or more lines were selected.
+        # 1     No lines were selected.
+        # >1    An error occurred.
+        #
+        # Flip 0 and 1 meanings:
+        case $ERR in
+            "0")
+                echo "Typos found!"
+                exit 1
+                ;;
+            "1")
+                echo "No typos found!"
+                exit 0
+                ;;
+            *)
+                echo "Some error occured."
+                exit $ERR
+                ;;
+        esac
+
 - publisher:
     name: webpagetest-irc
     publishers:
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index b5cd528..8bfdb4d 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -79,51 +79,6 @@
         docsrc: 'src'
         docdest: 'puppetsource'
 
-# Find out common typos in any files of ops/puppet
-- job-template:
-    name: 'operations-puppet-typos'
-    # Bound to Trusty since we need grep v2.11-8 for -r to not follow symlinks
-    node: contintLabsSlave && UbuntuTrusty
-    defaults: use-remote-zuul-shallow-clone
-    concurrent: true
-
-    triggers:
-     - zuul
-
-    builders:
-     - shell: |
-        #!/bin/bash -e
-        echo "Looking potential typos from '/typos' file"
-
-        # Ignore grep errors, we handle them manually
-        set +e
-            # -r does not follow symlinks
-            (fgrep -r --color=always --file=typos --exclude=typos *)
-            ERR="$?"
-        set -e
-
-        # The grep utility exits with one of the following values:
-        #
-        # 0     One or more lines were selected.
-        # 1     No lines were selected.
-        # >1    An error occurred.
-        #
-        # Flip 0 and 1 meanings:
-        case $ERR in
-            "0")
-                echo "Typos found!"
-                exit 1
-                ;;
-            "1")
-                echo "No typos found!"
-                exit 0
-                ;;
-            *)
-                echo "Some error occured."
-                exit $ERR
-                ;;
-        esac
-
 - project:
     name: 'operations-puppet'
 
@@ -134,7 +89,7 @@
      - '{name}-puppetlint-lenient'
      - '{name}-puppetlint-strict'
      - '{name}-tox-{toxenv}-jessie'
-     - operations-puppet-typos
+     - '{name}-typos'
      - operations-puppet-test
      - operations-puppet-doc
      - operations-puppet-pep8

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia3d5687f4c29bb83571b5a9bd89f6ba003afd2cd
Gerrit-PatchSet: 1
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

Reply via email to