Merge "Update Ubuntu docker image"

[releng/builder.git] / jjb / packaging / puppet.yaml

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index fa1eeb7eb1e42a850526a9f7c18f07b94ad2241d..0fd69b51c6ae0c04102384507a0fbe391e5bcf35 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -13,15 +13,13 @@
     stream:
       - master:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
+      - oxygen:
+          branch: 'stable/oxygen'
 
 - job-template:
     name: '{project-name}-test-sanity-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle
 
@@ -68,7 +66,7 @@
 - job-template:
     name: '{project-name}-test-full-{stream}'
 
-    node: centos7-docker-2c-4g
+    node: centos7-docker-1c-4g
 
     project-type: freestyle