diff --git a/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
new file mode 100644
index 0000000000..36618b019a
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/groups.yaml
@@ -0,0 +1,50 @@
+- job:
+    name: gate-groups-unittests
+    node: bare-precise
+
+    builders:
+        - gerrit-git-prep
+        - shell: |
+            ./scripts/bootstrap.sh
+            ./scripts/gate-build.sh
+    publishers:
+        - console-log
+        - coverage-log
+        - scp:
+            site: 'static.openstack.org'
+            files:
+                - target: 'logs/$LOG_PATH'
+                  source: './reports/**'
+                  keep-hierarchy: true
+                  copy-after-failure: true
+
+- job-template:
+    name: 'groups-release-{branch-designator}'
+    node: bare-precise
+
+    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/
+    publishers:
+        - console-log
+        - coverage-log
+        - scp:
+            site: 'static.openstack.org'
+            files:
+                - target: 'logs/$LOG_PATH'
+                  source: './reports/**'
+                  keep-hierarchy: true
+                  copy-after-failure: true
+        - tarball:
+            project: '{name}'
+            site: '{tarball-site}'
\ No newline at end of file
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 178afdb103..06bbc2aa82 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -2134,6 +2134,7 @@
     jobs:
       - python-jobs
 
+
 - project:
     name: gce-api
     github-org: stackforge
@@ -2142,3 +2143,15 @@
 
     jobs:
       - python-jobs
+
+- project:
+    name: groups
+    github-org: openstack-infra
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - 'groups-release-{branch-designator}':
+          branch-designator: 'master'
+      - 'groups-release-{branch-designator}':
+          branch-designator: 'branch'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5dfe3b9c53..7a3feca2d1 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2450,9 +2450,13 @@ projects:
 
   - name: openstack-infra/groups
     check:
-      - gate-noop
+      - gate-groups-unittests
     gate:
-      - gate-noop
+      - gate-groups-unittests
+    post:
+      - groups-release-branch
+    release:
+      - groups-release-master
 
   - name: openstack-infra/jeepyb
     check: