Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix the repositories as per #271 and #272 #281

Merged
merged 1 commit into from
Oct 17, 2018
Merged

fix the repositories as per #271 and #272 #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions data/family/RedHat.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ gitlab::repository_configuration:
assumeyes: true
enabled: 1
baseurl: "https://packages.gitlab.com/gitlab/gitlab-ce/el/%{facts.os.release.major}/$basearch"
gpgkey: "https://packages.gitlab.com/gpg.key"
gpgkey: "https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey/gitlab-gitlab-ce-3D645A26AB9FBD22.pub.gpg"
gpgcheck: 1
repo_gpgcheck: 1
sslverify: 1
"gitlab_official_ee":
ensure: 'present'
assumeyes: true
enabled: 1
baseurl: "https://packages.gitlab.com/gitlab/gitlab-%{lookup('gitlab::edition')}/el/%{facts.os.release.major}/$basearch"
gpgkey: "https://packages.gitlab.com/gitlab/gitlab-%{lookup('gitlab::edition')}/gpgkey https://packages.gitlab.com/gitlab/gitlab-%{lookup('gitlab::edition')}/gpgkey/gitlab-gitlab-%{lookup('gitlab::edition')}-3D645A26AB9FBD22.pub.gpg"
baseurl: "https://packages.gitlab.com/gitlab/gitlab-ee/el/%{facts.os.release.major}/$basearch"
gpgkey: "https://packages.gitlab.com/gitlab/gitlab-ee/gpgkey https://packages.gitlab.com/gitlab/gitlab-ee/gpgkey/gitlab-gitlab-ee-3D645A26AB9FBD22.pub.gpg"
gpgcheck: 1
repo_gpgcheck: 1
sslverify: 1
Expand Down
8 changes: 7 additions & 1 deletion spec/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
end
when 'RedHat'
it { is_expected.to contain_yumrepo('gitlab_official_ce').with_ensure('present').with_enabled(1) }
it { is_expected.to contain_yumrepo('gitlab_official_ce').without_baseurl(%r{/gitlab-/}) }
it { is_expected.to contain_yumrepo('gitlab_official_ce').without_gpgkey(%r{/gitlab-/}) }
it { is_expected.to contain_yumrepo('gitlab_official_ce').without_gpgkey('https://packages.gitlab.com/gpg.key') }
it { is_expected.to contain_yumrepo('gitlab_official_ee').with_ensure('absent') }
it { is_expected.not_to contain_yumrepo('gitlab_official_') }
it { is_expected.not_to contain_apt__source('gitlab_official_ce') }
Expand All @@ -53,7 +56,10 @@
it { is_expected.to contain_apt__source('gitlab_official_ce').with_ensure('absent') }
when 'RedHat'
it { is_expected.to contain_yumrepo('gitlab_official_ee').with_ensure('present') }
it { is_expected.to contain_yumrepo('gitlab_official_ce').with_ensure('absent') }
it { is_expected.to contain_yumrepo('gitlab_official_ee').without_baseurl(%r{/gitlab-/}) }
it { is_expected.to contain_yumrepo('gitlab_official_ee').without_gpgkey(%r{/gitlab-/}) }
it { is_expected.to contain_yumrepo('gitlab_official_ee').without_gpgkey('https://packages.gitlab.com/gpg.key') }
it { is_expected.to contain_yumrepo('gitlab_official_ce').with_ensure('absent') }
end
end
describe 'external_url' do
Expand Down