Commit 4dffe0c1 authored by Marin Jankovski's avatar Marin Jankovski

Bump gitlab versions.

parent a9ec74b3
...@@ -3,8 +3,8 @@ GitLab Cookbook ...@@ -3,8 +3,8 @@ GitLab Cookbook
Chef cookbook with recipes to install GitLab and its dependencies: Chef cookbook with recipes to install GitLab and its dependencies:
* GitLab: 7.1 * GitLab: 7.2
* GitLab Shell: 1.9.6 * GitLab Shell: 1.9.7
* Ruby: 2.1.2 * Ruby: 2.1.2
* Redis: 2.6.13 * Redis: 2.6.13
* Git: 2.0.0 * Git: 2.0.0
......
...@@ -55,11 +55,11 @@ if node['gitlab']['env'] == "development" ...@@ -55,11 +55,11 @@ if node['gitlab']['env'] == "development"
default['gitlab']['shell_revision'] = "master" default['gitlab']['shell_revision'] = "master"
else else
default['gitlab']['environments'] = %w{production} default['gitlab']['environments'] = %w{production}
default['gitlab']['revision'] = "7-1-stable" # Must be branch, otherwise GitLab update will run on each chef run default['gitlab']['revision'] = "7-2-stable" # Must be branch, otherwise GitLab update will run on each chef run
default['gitlab']['url'] = "http://localhost:80/" default['gitlab']['url'] = "http://localhost:80/"
default['gitlab']['port'] = "80" default['gitlab']['port'] = "80"
default['gitlab']['ssh_port'] = "22" default['gitlab']['ssh_port'] = "22"
default['gitlab']['shell_revision'] = "v1.9.6" default['gitlab']['shell_revision'] = "v1.9.7"
end end
# GitLab configuration # GitLab configuration
......
...@@ -40,6 +40,5 @@ Provision a GitLab instance by using the cookbook in supported environments: ...@@ -40,6 +40,5 @@ Provision a GitLab instance by using the cookbook in supported environments:
1. Ubuntu 12.04 1. Ubuntu 12.04
1. CentOS 6.5 1. CentOS 6.5
1. AWS OpsWorks
After provisioning, login to each instance and *at least* create a repository and push to GitLab. After provisioning, login to each instance and *at least* create a repository and push to GitLab.
...@@ -15,7 +15,7 @@ describe "gitlab::clone" do ...@@ -15,7 +15,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with( expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git', repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-1-stable', revision: '7-2-stable',
user: 'git', user: 'git',
group: 'git' group: 'git'
) )
...@@ -49,7 +49,7 @@ describe "gitlab::clone" do ...@@ -49,7 +49,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do it "clones the gitlab repository" do
expect(chef_run).to sync_git('/data/git/gitlab').with( expect(chef_run).to sync_git('/data/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git', repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-1-stable', revision: '7-2-stable',
user: 'git', user: 'git',
group: 'git' group: 'git'
) )
...@@ -69,7 +69,7 @@ describe "gitlab::clone" do ...@@ -69,7 +69,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do it "clones the gitlab repository" do
expect(chef_run).to sync_git('/home/git/gitlab').with( expect(chef_run).to sync_git('/home/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git', repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-1-stable', revision: '7-2-stable',
user: 'git', user: 'git',
group: 'git' group: 'git'
) )
...@@ -103,7 +103,7 @@ describe "gitlab::clone" do ...@@ -103,7 +103,7 @@ describe "gitlab::clone" do
it "clones the gitlab repository" do it "clones the gitlab repository" do
expect(chef_run).to sync_git('/data/git/gitlab').with( expect(chef_run).to sync_git('/data/git/gitlab').with(
repository: 'https://github.com/gitlabhq/gitlabhq.git', repository: 'https://github.com/gitlabhq/gitlabhq.git',
revision: '7-1-stable', revision: '7-2-stable',
user: 'git', user: 'git',
group: 'git' group: 'git'
) )
......
...@@ -15,7 +15,7 @@ describe "gitlab::gitlab_shell_clone" do ...@@ -15,7 +15,7 @@ describe "gitlab::gitlab_shell_clone" do
it "clones the gitlab-shell repository" do it "clones the gitlab-shell repository" do
expect(chef_run).to sync_git('/home/git/gitlab-shell').with( expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
repository: 'https://github.com/gitlabhq/gitlab-shell.git', repository: 'https://github.com/gitlabhq/gitlab-shell.git',
revision: "v1.9.6", revision: "v1.9.7",
user: 'git', user: 'git',
group: 'git' group: 'git'
) )
...@@ -64,7 +64,7 @@ describe "gitlab::gitlab_shell_clone" do ...@@ -64,7 +64,7 @@ describe "gitlab::gitlab_shell_clone" do
it "clones the gitlab-shell repository" do it "clones the gitlab-shell repository" do
expect(chef_run).to sync_git('/home/git/gitlab-shell').with( expect(chef_run).to sync_git('/home/git/gitlab-shell').with(
repository: 'https://github.com/gitlabhq/gitlab-shell.git', repository: 'https://github.com/gitlabhq/gitlab-shell.git',
revision: "v1.9.6", revision: "v1.9.7",
user: 'git', user: 'git',
group: 'git' group: 'git'
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment