Merge "Revert "Robot installation: Pinpoint pycparser version""

[releng/builder.git] / jjb / vtn / vtn.yaml

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index f16dab708866c3970eeffffb891b82b95d6c9481..0209c75bdd6f5402f2a61608b7f5a6b17a8319de 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -10,8 +10,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - carbon:
             disable_autorelease: False
@@ -24,7 +22,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -48,8 +46,6 @@
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
             disable_autorelease: False
@@ -62,7 +58,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -85,8 +81,6 @@
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
 
     stream:
         - beryllium:
@@ -102,7 +96,7 @@
         - openjdk8
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-settings: 'vtn-settings'
     mvn-goals: 'clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'