diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9fa3a2e..4c36127 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,77 +3,95 @@ variables:
   GIT_STRATEGY: "clone"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_PREFIX: "/home/tsg/tfe"
+  FRAMEWORK_REPO_ID: mesa-framework-stable
+  UPLOAD_TO_REPO_ID: mesa-framework-testing
+  TESTRING_VERSION_BUILD: 0
 
 stages:
 - build
-- package
-- deploy
 
 .build_by_travis:
   before_script:
   - pulp-consumer -u $PULP_CI_USER -p $PULP_CI_PASSWORD register --consumer-id gitlab-ci-$CI_JOB_NAME-$CI_JOB_ID
   - pulp-consumer rpm bind --repo-id $FRAMEWORK_REPO_ID
+  - pulp-admin login -u $PULP_CI_USER -p $PULP_CI_PASSWORD
   - mkdir -p $BUILD_PADDING_PREFIX/$CI_PROJECT_NAMESPACE/
   - ln -s $CI_PROJECT_DIR $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
   - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
   - chmod +x ./ci/travis.sh
+  script:
+  - yum makecache
+  - ./ci/travis.sh
   after_script:
   - pulp-consumer unregister
-
-build_debug:
-  stage: build
-  variables:
-    FRAMEWORK_REPO_ID: mesa-framework-stable
-    BUILD_TYPE: Debug
-  extends: .build_by_travis
-  script:
-    - yum makecache
-    - ./ci/travis.sh
+  - pulp-admin logout
   tags:
-    - share
+  - share
+
+branch_build_debug:
+  stage: build
+  extends: .build_by_travis
+  variables:
+    BUILD_TYPE: Debug
   except:
+    - develop-*
+    - release-*
     - tags
 
-build_release:
+branch_build_release:
   stage: build
   variables:
-    FRAMEWORK_REPO_ID: mesa-framework-stable
     BUILD_TYPE: RelWithDebInfo
   extends: .build_by_travis
-  script:
-    - yum makecache
-    - ./ci/travis.sh
-  tags:
-    - share
   except:
+    - develop-*
+    - release-*
     - tags
 
-#package_debug:
-#  stage: package
-#  variables:
-#    BUILD_TYPE: Debug
-#    PACKAGE: 1
-#  extends: .build_by_travis
-#  artifacts:
-#    name: "tfe-install-$CI_COMMIT_REF_NAME-debug"
-#    paths:
-#    - build/*.rpm
-#  tags:
-#    - share
-#  only:
-#    - tags
-#
-#package_release:
-#  stage: package
-#  variables:
-#    BUILD_TYPE: RelWithDebInfo
-#    PACKAGE: 1
-#  extends: .build_by_travis
-#  artifacts:
-#    name: "tfe-install-$CI_COMMIT_REF_NAME-release"
-#    paths:
-#    - build/*.rpm
-#  tags:
-#    - share
-#  only:
-#    - tags
+testing_version_build_debug:
+  stage: build
+  extends: .build_by_travis
+  variables:
+    TESTRING_VERSION_BUILD: 1
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+  only:
+    - develop-*
+    - release-*
+
+testing_version_build_release:
+  stage: build
+  extends: .build_by_travis
+  variables:
+    TESTRING_VERSION_BUILD: 1
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+  only:
+    - develop-*
+    - release-*
+
+product_build_debug:
+  stage: build
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+  extends: .build_by_travis
+  artifacts:
+    name: "tfe-install-$CI_COMMIT_REF_NAME-debug"
+    paths:
+    - build/*.rpm
+  only:
+    - tags
+
+product_build_release:
+  stage: build
+  variables:
+    BUILD_TYPE: RelWithDebInfo
+    PACKAGE: 1
+  extends: .build_by_travis
+  artifacts:
+    name: "tfe-install-$CI_COMMIT_REF_NAME-debug"
+    paths:
+      - build/*.rpm
+  only:
+    - tags
diff --git a/ci/travis.sh b/ci/travis.sh
index 130fa4b..c3dc48f 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -38,10 +38,14 @@ cd build
 cmake -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
       -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
       -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
+      -DTESTRING_VERSION_BUILD=$TESTRING_VERSION_BUILD \
       ..
+
 make
-#CTEST_OUTPUT_ON_FAILURE=1 make test
+make test
 
 if [ -n "${PACKAGE}" ]; then
 	make package
+	pulp-admin rpm repo uploads rpm --repo-id ${UPLOAD_TO_REPO_ID} -f build/*.rpm
+	pulp-admin rpm repo publish run --repo-id ${UPLOAD_TO_REPO_ID}
 fi