diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp
index 9b00532544..c0357fca4c 100644
--- a/modules/jenkins/manifests/params.pp
+++ b/modules/jenkins/manifests/params.pp
@@ -50,6 +50,8 @@ class jenkins::params {
       $unzip_package = 'unzip'
       $xslt_package = 'libxslt'
       $xvfb_package = 'xorg-x11-server-Xvfb'
+      # PHP package, used for community portal
+      $php5_cli_package = 'php-cli'
       # For Tooz unit tests
       # FIXME: No zookeeper packages on RHEL
       #$zookeeper_package = 'zookeeper-server'
@@ -126,6 +128,8 @@ class jenkins::params {
       $unzip_package = 'unzip'
       $xslt_package = 'xsltproc'
       $xvfb_package = 'xvfb'
+      # PHP package, used for community portal
+      $php5_cli_package = 'php5-cli'
       # For [tooz, taskflow, nova] using zookeeper in unit tests
       $zookeeper_package = 'zookeeperd'
       $cgroups_package = 'cgroup-bin'
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 8299d68a10..56bf7962d8 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -63,6 +63,7 @@ class jenkins::slave(
     $::jenkins::params::unzip_package,
     $::jenkins::params::xslt_package, # for building openstack docs
     $::jenkins::params::xvfb_package, # for selenium tests
+    $::jenkins::params::php5_cli_package, # for community portal build
   ]
 
   if ($bare == false) {
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
index 36618b019a..d1df71917d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
@@ -1,12 +1,16 @@
 - job:
     name: gate-groups-unittests
-    node: bare-precise
+    node: '{node}'
 
     builders:
         - gerrit-git-prep
         - shell: |
-            ./scripts/bootstrap.sh
-            ./scripts/gate-build.sh
+            #!/bin/bash -xe
+            # fetch drush
+            mkdir drush
+            curl -L https://github.com/drush-ops/drush/archive/6.0.0.tar.gz | tar -xz -C drush --strip 1
+            # build distribution
+            ./drush/drush make build-groups.make dist
     publishers:
         - console-log
         - coverage-log
@@ -20,21 +24,29 @@
 
 - job-template:
     name: 'groups-release-{branch-designator}'
-    node: bare-precise
+    node: '{node}'
 
     builders:
         - gerrit-git-prep
         - shell: |
             #!/bin/bash -xe
-            ./script/bootstrap.sh
-            ARCHIVE_NAME={name}
-            if [ "$BRANCH" != "master" ] ; then
-                BRANCH_PATH=`echo $ZUUL_REFNAME | tr / -`
-                ARCHIVE_NAME={name}-{branch-designator}
-            fi
-            drush make build-groups.make dist
-            tar -czf $ARCHIVE_NAME.tar.gz dist/
-            mv $ARCHIVE_NAME.tar.gz dist/
+            /usr/local/jenkins/slave_scripts/maven-properties.sh
+        - inject:
+            properties-file: maven.properties
+        - shell: |
+            #!/bin/bash -xe
+            # fetch drush
+            mkdir drush
+            curl -L https://github.com/drush-ops/drush/archive/6.0.0.tar.gz | tar -xz -C drush --strip 1
+            # build distribution
+            ./drush/drush make build-groups.make dist
+            # Clean/create a tarball directory
+            rm -rf tarballs
+            mkdir -p tarballs
+            # Create an archive tarball.
+            tar -czf groups-$PROJECT_VER.tar.gz dist/
+            cp groups-$PROJECT_VER.tar.gz tarballs/groups-latest.tar.gz
+            mv groups-$PROJECT_VER.tar.gz tarballs/
     publishers:
         - console-log
         - coverage-log
@@ -45,6 +57,7 @@
                   source: './reports/**'
                   keep-hierarchy: true
                   copy-after-failure: true
-        - tarball:
-            project: '{name}'
-            site: '{tarball-site}'
\ No newline at end of file
+                - target: 'tarballs/groups/'
+                  source: 'tarballs/*.tar.gz'
+                  keep-hierarchy: false
+                  copy-after-failure: false
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 3ce4967f51..7544532ac1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2152,6 +2152,7 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
+      - gate-groups-unittests
       - 'groups-release-{branch-designator}':
           branch-designator: 'master'
       - 'groups-release-{branch-designator}':