Bump to Gitlab 7.12 stable branch

* bump gitlab to 7-12-stable branch * bump gitlab-shell to 2.6.3 (latest) * bump ruby version to 2.1.6
sbadia · Jul 11, 2015 · 91a71d8 · 91a71d8
1 parent da69224
commit 91a71d8
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/manifests/ci.pp b/manifests/ci.pp
@@ -42,7 +42,7 @@
 #
 # [*gitlab_ruby_version*]
 #   Ruby version to install with rbenv for Gitlab user
-#   default: 2.1.2
+#   default: 2.1.6
 #
 # [*gitlab_manage_nginx*]
 #   Whether or not this module should install a templated Nginx

diff --git a/manifests/ci/params.pp b/manifests/ci/params.pp
@@ -38,6 +38,6 @@
   $gitlabci_bundler_flags     = '--deployment'
   $gitlabci_bundler_jobs      = 1
   $exec_path                  = "${ci_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-  $gitlab_ruby_version        = '2.1.2'
+  $gitlab_ruby_version        = '2.1.6'
 
 } # Class:: gitlab::ci::params
diff --git a/manifests/ci/runner.pp b/manifests/ci/runner.pp
@@ -34,7 +34,7 @@
 #
 # [*ruby_version*]
 #   Ruby version to install with rbenv for Gitlab user
-#   default: 2.1.2
+#   default: 2.1.6
 #
 # [*exec_path*]
 #   The default PATH passed to all exec ressources (this path include rbenv shims)
@@ -46,7 +46,7 @@
   $ensure              = 'present',
   $branch              = '5-0-stable',
   $exec_path           = '/home/gitlab_ci_runner/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
-  $ruby_version        = '2.1.2',
+  $ruby_version        = '2.1.6',
   $source              = 'https://gitlab.com/gitlab-org/gitlab-ci-runner.git',
   $user                = 'gitlab_ci_runner',
   $user_home           = '/home/gitlab_ci_runner',

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -54,15 +54,15 @@
 #
 # [*gitlab_branch*]
 #   Gitlab branch
-#   default: 6-9-stable
+#   default: 7-12-stable
 #
 # [*gitlabshell_sources*]
 #   Gitlab-shell sources
 #   default: git://github.com/gitlabhq/gitlab-shell.git
 #
 # [*gitlabshell_branch*]
 #   Gitlab-shell branch
-#   default: v1.9.4
+#   default: v2.6.3
 #
 # [*gitlabshell_log_folder*]
 #   Gitlab-shell log folder
@@ -294,7 +294,7 @@
 #
 # [*gitlab_ruby_version*]
 #   Ruby version to install with rbenv for the Gitlab user
-#   default: 2.1.2
+#   default: 2.1.6
 #
 # [*gitlab_secret_file*]
 #   File that contains the secret key for verifying access for gitlab-shell.

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -16,9 +16,9 @@
   $git_timeout              = 10
   $gitlab_webhook_timeout   = 10
   $gitlab_sources           = 'git://github.com/gitlabhq/gitlabhq.git'
-  $gitlab_branch            = '6-9-stable'
+  $gitlab_branch            = '7-12-stable'
   $gitlabshell_sources      = 'git://github.com/gitlabhq/gitlab-shell.git'
-  $gitlabshell_branch       = 'v1.9.4'
+  $gitlabshell_branch       = 'v2.6.3'
   $gitlabshell_log_folder   = undef
   $gitlab_log_folder        = undef
   $gitlab_manage_nginx      = true
@@ -74,7 +74,7 @@
   $gitlab_ensure_postfix    = true
   $gitlab_ensure_curl       = true
   $gitlab_manage_rbenv      = true
-  $gitlab_ruby_version      = '2.1.2'
+  $gitlab_ruby_version      = '2.1.6'
   $gitlab_auth_file         = "${git_home}/.ssh/authorized_keys"
   $gitlab_secret_file       = undef
   $exec_path                = "${git_home}/.rbenv/shims:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"

diff --git a/spec/classes/ci/gitlab_ci_runner_spec.rb b/spec/classes/ci/gitlab_ci_runner_spec.rb
@@ -41,7 +41,7 @@
   it { is_expected.to contain_rbenv__compile('gitlab-ci-runner/ruby').with(
     :user   => 'gitlab_ci_runner',
     :home   => '/home/gitlab_ci_runner',
-    :ruby   => '2.1.2',
+    :ruby   => '2.1.6',
     :global => true,
     :notify => 'Exec[install gitlab-ci-runner]'
   )}

diff --git a/spec/classes/ci/gitlab_setup_spec.rb b/spec/classes/ci/gitlab_setup_spec.rb
@@ -57,7 +57,7 @@
           it { is_expected.to contain_rbenv__compile('gitlabci/ruby').with(
                         :user   => 'gitlab_ci',
                         :home   => '/home/gitlab_ci',
-                        :ruby   => '2.1.2',
+                        :ruby   => '2.1.6',
                         :global => true,
                         :notify => 'Exec[install gitlab-ci]'
                       )}

diff --git a/spec/classes/gitlab_package_spec.rb b/spec/classes/gitlab_package_spec.rb
@@ -25,14 +25,14 @@
           :user     => 'git',
           :provider => 'git',
           :source   => 'git://github.com/gitlabhq/gitlabhq.git',
-          :revision => '6-9-stable'
+          :revision => '7-12-stable'
         )}
         it { is_expected.to contain_vcsrepo('/home/git/gitlab-shell').with(
           :ensure   => 'present',
           :user     => 'git',
           :provider => 'git',
           :source   => 'git://github.com/gitlabhq/gitlab-shell.git',
-          :revision => 'v1.9.4'
+          :revision => 'v2.6.3'
         )}
       end
       context 'with specifics params' do

diff --git a/spec/classes/gitlab_setup_spec.rb b/spec/classes/gitlab_setup_spec.rb
@@ -70,7 +70,7 @@
         it { is_expected.to contain_rbenv__compile('gitlab/ruby').with(
                       :user   => 'git',
                       :home   => '/home/git',
-                      :ruby   => '2.1.2',
+                      :ruby   => '2.1.6',
                       :global => true,
                       :notify => ['Exec[install gitlab-shell]', 'Exec[install gitlab]']
                     )}