Skip to content

Commit 04bdcb0

Browse files
committed
Merge branch 'main' into add_purge_recurse_to_include_directory_when_mariadb
2 parents 885679f + 5b8aa06 commit 04bdcb0

2 files changed

Lines changed: 23 additions & 1 deletion

File tree

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Contributing to Puppet modules
22

3-
Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need.
3+
Check out our [Contributing to Puppet modules docs](https://help.puppet.com/core//current/Content/PuppetCore/contributing.htm) to find all the information that you will need.

spec/spec_helper_acceptance_local.rb

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,29 @@ class LitmusHelper
77
include PuppetLitmus
88
end
99

10+
# TEMPORARY FIX for unregistered SLES CI systems with no repos configured.
11+
# Configures openSUSE Leap and MariaDB repos to enable package installation.
12+
# DO NOT use in production - not enterprise-supported.
13+
def configure_sles_repos_once
14+
return if @sles_repos_configured || os[:family] != 'sles'
15+
16+
sles_version = os[:release].to_i
17+
base_url = (sles_version == 12) ? 'http://download.opensuse.org/distribution/leap/42.3/repo' : 'http://download.opensuse.org/distribution/leap/15.6/repo'
18+
mariadb_version = (sles_version == 12) ? '10.6' : '10.11'
19+
20+
LitmusHelper.instance.run_shell("zypper --non-interactive --gpg-auto-import-keys ar #{base_url}/oss/ opensuse-leap-oss || true", expect_failures: true)
21+
LitmusHelper.instance.run_shell("zypper --non-interactive --gpg-auto-import-keys ar #{base_url}/non-oss/ opensuse-leap-non-oss || true", expect_failures: true)
22+
LitmusHelper.instance.run_shell('rpm --import https://supplychain.mariadb.com/MariaDB-Server-GPG-KEY', expect_failures: true)
23+
LitmusHelper.instance.run_shell("zypper --non-interactive --gpg-auto-import-keys ar https://rpm.mariadb.org/#{mariadb_version}/sles/#{sles_version}/x86_64 mariadb || true", expect_failures: true)
24+
LitmusHelper.instance.run_shell('zypper --non-interactive --gpg-auto-import-keys refresh', expect_failures: false)
25+
LitmusHelper.instance.apply_manifest("package { 'net-tools-deprecated': ensure => 'latest', }", expect_failures: false)
26+
27+
@sles_repos_configured = true
28+
end
29+
1030
def mysql_version
31+
configure_sles_repos_once
32+
1133
shell_output = LitmusHelper.instance.run_shell('mysql --version', expect_failures: true)
1234
if shell_output.stdout.match(%r{\d+\.\d+\.\d+}).nil?
1335
# mysql is not yet installed, so we apply this class to install it

0 commit comments

Comments
 (0)