Change all '_' to '-' in YAML for consistency.

Change-Id: If19cb26fa544b485acfc188baf3506eaea61d6cf
Reviewed-on: https://review.openstack.org/11154
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins

example/ceilometer.yml

@@ -37,8 +37,8 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
-      - python26_essex
+      - python26-essex
 
     # >= precise does not have python2.6
     node: oneiric
@@ -74,7 +74,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
-      - python27_essex
+      - python27-essex
 
     node: oneiric

example/devstack-gate.yml

@@ -29,7 +29,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
 
 - job:
@@ -69,7 +69,7 @@
     builders:
       - trigger-builds:
           - project: devstack-update-inprogress
-            predefined_parameters:
+            predefined-parameters:
               DEVSTACK_NODE_NAME=${NODE_NAME}
       - shell: |
           #!/bin/bash -xe
@@ -103,7 +103,7 @@
       - trigger-parameterized-builds:
           - project: devstack-update-complete
             when: complete
-            predefined_parameters:
+            predefined-parameters:
               DEVSTACK_NODE_NAME=${NODE_NAME}
 
 
@@ -144,7 +144,7 @@
     builders:
       - trigger-builds:
           - project: devstack-update-inprogress
-            predefined_parameters:
+            predefined-parameters:
               DEVSTACK_NODE_NAME=${NODE_NAME}
       - shell: |
           #!/bin/bash -xe
@@ -179,7 +179,7 @@
       - trigger-parameterized-builds:
           - project: devstack-update-complete
             when: complete
-            predefined_parameters:
+            predefined-parameters:
               DEVSTACK_NODE_NAME=${NODE_NAME}
 
 

example/devstack.yml

@@ -30,4 +30,4 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep

example/gerrit-verification-status-plugin.yml

@@ -30,6 +30,6 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
     node: precise

example/gerrit.yml

@@ -31,7 +31,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
     node: precise
 
@@ -60,17 +60,17 @@
       - zuul
 
     prebuilders:
-      - gerrit_git_prep
+      - gerrit-git-prep
-      - gerrit_preclean
+      - gerrit-preclean
 
     maven:
-      root_module:
+      root-module:
-        group_id: com.google.gerrit
+        group-id: com.google.gerrit
-        artifact_id: gerrit-parent
+        artifact-id: gerrit-parent
       goals: 'clean package -Dgerrit.include-documentation=1 -X'
 
     postbuilders:
-      - gerrit_postrun
+      - gerrit-postrun
 
     publishers:
       - war:
@@ -103,17 +103,17 @@
       - zuul
 
     prebuilders:
-      - gerrit_git_prep
+      - gerrit-git-prep
-      - gerrit_preclean
+      - gerrit-preclean
 
     maven:
-      root_module:
+      root-module:
-        group_id: com.google.gerrit
+        group-id: com.google.gerrit
-        artifact_id: gerrit-parent
+        artifact-id: gerrit-parent
       goals: 'clean package -Dgerrit.include-documentation=1 -X'
 
     postbuilders:
-      - gerrit_postrun
+      - gerrit-postrun
 
 
 - job:
@@ -137,20 +137,20 @@
           enabled: false
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     prebuilders:
-      - gerrit_git_prep
+      - gerrit-git-prep
-      - gerrit_preclean
+      - gerrit-preclean
 
     maven:
-      root_module:
+      root-module:
-        group_id: com.google.gerrit
+        group-id: com.google.gerrit
-        artifact_id: gerrit-parent
+        artifact-id: gerrit-parent
       goals: 'clean package -Dgerrit.include-documentation=1 -X'
 
     postbuilders:
-      - gerrit_postrun
+      - gerrit-postrun
 
     publishers:
       - war:

example/gerritbot.yml

@@ -34,7 +34,7 @@
           fail: true
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     logrotate:
       daysToKeep: 28
@@ -43,7 +43,7 @@
       artifactNumToKeep: -1
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
           BRANCH=$GERRIT_REFNAME
@@ -78,10 +78,10 @@
           fail: true
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - shell: tox -v -evenv python setup.py sdist upload
 
     publishers:

example/gerritlib.yml

@@ -33,10 +33,10 @@
       - timestamps
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - shell: tox -v -evenv python setup.py sdist upload
 
     publishers:

example/horizon.yml

@@ -39,5 +39,5 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - selenium

example/jenkins-job-builder.yml

@@ -31,4 +31,4 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep

example/macros.yml

@@ -1,5 +1,5 @@
 - builder:
-    name: gerrit_git_prep
+    name: gerrit-git-prep
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/gerrit-git-prep.sh review.openstack.org"
 
@@ -14,28 +14,28 @@
       - shell: "/usr/local/jenkins/slave_scripts/run-docs.sh"
 
 - builder:
-    name: maven_test
+    name: maven-test
     builders:
       - shell: "mvn test"
 
 - builder:
-    name: maven_package
+    name: maven-package
     builders:
       - shell: "mvn package"
 
 - builder:
-    name: gerrit_package
+    name: gerrit-package
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/package-gerrit.sh"
 
 - builder:
-    name: gerrit_preclean
+    name: gerrit-preclean
     #TODO: multiline:
     builders:
       - shell: "#!/bin/bash -xe\nrm -fr ~/.m2\nrm -fr ~/.java\n./tools/version.sh --release"
 
 - builder:
-    name: gerrit_postrun
+    name: gerrit-postrun
     builders:
       - shell: "./tools/version.sh --reset"
 
@@ -50,7 +50,7 @@
       - shell: "tox -v -epyflakes"
 
 - builder:
-    name: puppet_syntax
+    name: puppet-syntax
     builders:
       # TODO: remove blank line
       - shell: |
@@ -78,12 +78,12 @@
       - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27"
 
 - builder:
-    name: python26_essex
+    name: python26-essex
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-essex"
 
 - builder:
-    name: python27_essex
+    name: python27-essex
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-essex"
 

example/mraas.yml

@@ -39,7 +39,7 @@
               branchPattern: '**'
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
 
 - job:
@@ -79,4 +79,4 @@
               branchPattern: '**'
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep

example/openstack-ci-puppet.yml

@@ -31,7 +31,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
 
 - job:
@@ -58,6 +58,6 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
-      - puppet_syntax
+      - puppet-syntax
       - pyflakes

example/openstack-publish-jobs.yml

@@ -20,7 +20,7 @@
       - timestamps
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     logrotate:
       daysToKeep: 28
@@ -29,7 +29,7 @@
       artifactNumToKeep: -1
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - docs
 
     publishers:
@@ -62,7 +62,7 @@
       - timestamps
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     logrotate:
       daysToKeep: 28
@@ -71,7 +71,7 @@
       artifactNumToKeep: -1
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - tarball:
           project: '{name}'
 

example/pypi-jobs.yml

@@ -20,7 +20,7 @@
       - timestamps
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     logrotate:
       daysToKeep: 28
@@ -29,7 +29,7 @@
       artifactNumToKeep: -1
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - shell: |
           #!/bin/bash -xe
           BRANCH=$GERRIT_REFNAME
@@ -66,10 +66,10 @@
       - timestamps
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - shell: tox -v -evenv python setup.py sdist upload
 
     publishers:

example/pypi-mirror.yml

@@ -33,7 +33,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
 - job:
     name: gate-pypi-mirror-pyflakes
@@ -60,5 +60,5 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - pyflakes

example/python-jobs.yml

@@ -24,10 +24,10 @@
       artifactNumToKeep: -1
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - coverage
 
     publishers:
@@ -65,7 +65,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - pep8
 
     publishers:
@@ -103,7 +103,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - python26
 
     # >= precise does not have python2.6
@@ -145,7 +145,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - python27
 
     node: '{node}'
@@ -180,7 +180,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
     node: '{node}'
 
@@ -214,7 +214,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - docs
 
     node: '{node}'
@@ -251,7 +251,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - pyflakes
 
 

example/requirements.yml

@@ -29,6 +29,6 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
     node: precise

example/tempest.yml

@@ -31,7 +31,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
 
     node: precise
 
@@ -58,7 +58,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - pep8
 
     publishers:

example/zuul.yml

@@ -33,7 +33,7 @@
       - zuul
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - pyflakes
 
 
@@ -59,7 +59,7 @@
       - timestamps
 
     triggers:
-      - zuul_post
+      - zuul-post
 
     logrotate:
       daysToKeep: 28
@@ -68,7 +68,7 @@
       artifactNumToKeep: -1
 
     builders:
-      - gerrit_git_prep
+      - gerrit-git-prep
       - docs
 
     publishers:

jenkins_jobs/modules/builders.py

@@ -35,11 +35,11 @@ def trigger_builds(parser, xml_parent, data):
         tconfig = XML.SubElement(configs,
             'hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig')
         tconfigs = XML.SubElement(tconfig, 'configs')
-        if project_def.has_key('predefined_parameters'):
+        if project_def.has_key('predefined-parameters'):
             params = XML.SubElement(tconfigs,
                 'hudson.plugins.parameterizedtrigger.PredefinedBuildParameters')
             properties = XML.SubElement(params, 'properties')
-            properties.text = project_def['predefined_parameters']
+            properties.text = project_def['predefined-parameters']
         else:
             tconfigs.set('class', 'java.util.Collections$EmptyList')
         projects = XML.SubElement(tconfig, 'projects')

jenkins_jobs/modules/project_maven.py

@@ -31,8 +31,10 @@ class Maven(jenkins_jobs.modules.base.Base):
             return None
         xml_parent = XML.Element('maven2-moduleset')
         root_module = XML.SubElement(xml_parent, 'root_module')
-        XML.SubElement(root_module, 'groupId').text = data['maven']['root_module']['group_id']
+        XML.SubElement(root_module, 'groupId').text = \
-        XML.SubElement(root_module, 'artifactId').text = data['maven']['root_module']['artifact_id']
+            data['maven']['root-module']['group-id']
+        XML.SubElement(root_module, 'artifactId').text = \
+            data['maven']['root-module']['artifact-id']
         XML.SubElement(xml_parent, 'goals').text = data['maven']['goals']
 
         XML.SubElement(xml_parent, 'aggregatorStyleBuild').text = 'true'

jenkins_jobs/modules/publishers.py

@@ -40,11 +40,11 @@ def trigger_parameterized_builds(parser, xml_parent, data):
         tconfig = XML.SubElement(configs,
             'hudson.plugins.parameterizedtrigger.BuildTriggerConfig')
         tconfigs = XML.SubElement(tconfig, 'configs')
-        if project_def.has_key('predefined_parameters'):
+        if project_def.has_key('predefined-parameters'):
             params = XML.SubElement(tconfigs,
                 'hudson.plugins.parameterizedtrigger.PredefinedBuildParameters')
             properties = XML.SubElement(params, 'properties')
-            properties.text = project_def['predefined_parameters']
+            properties.text = project_def['predefined-parameters']
         else:
             tconfigs.set('class', 'java.util.Collections$EmptyList')
         projects = XML.SubElement(tconfig, 'projects')

jenkins_jobs/modules/zuul.py

@@ -68,7 +68,7 @@ class Zuul(jenkins_jobs.modules.base.Base):
                 continue
 
             if ('zuul' not in job.get('triggers', []) and
-                'zuul_post' not in job.get('triggers', [])):
+                'zuul-post' not in job.get('triggers', [])):
                 continue
             if 'parameters' not in job:
                 job['parameters'] = []
@@ -78,8 +78,8 @@ class Zuul(jenkins_jobs.modules.base.Base):
             if 'zuul' in job.get('triggers', []):
                 job['parameters'].extend(ZUUL_PARAMETERS)
                 job['triggers'].remove('zuul')
-            if 'zuul_post' in job.get('triggers', []):
+            if 'zuul-post' in job.get('triggers', []):
                 job['parameters'].extend(ZUUL_POST_PARAMETERS)
-                job['triggers'].remove('zuul_post')
+                job['triggers'].remove('zuul-post')
             changed = True
         return changed