Fix Github CI builds and modulesync #104

alexjfisher · 2021-07-15T14:42:24Z

This PR is a continuation of #93 (which I accidentally got into a closed state I couldn't reopen).

alexjfisher · 2021-07-15T22:00:18Z

@trevor-vaughan Hi! Any chance you could spare some beaker docker expertise?

Our github workflow has a 'gitlab' service started, but the beaker container doesn't seen to have any network connectivity with it.
(Also see this thread)

Feel free to push any commits BTW ;)

baurmatt · 2021-07-16T11:20:54Z

I tried to debug this a little bit further. Some things I've learned:

Github Actions creates a dedicated bridge network in which it runs services
Beaker containers are started in another bridge network, making it impossible to reach the Gitlab service running in the dedicated bridge network
Github Actions seems to have no way to change the dedicated network
We might be able to switch the Beaker container to the Github Actions network by leveraging the dockeropts config option. But I don't understand the syntax.
Using the "voxpupuli/puppet-vault_lookup" solution (creating a dedicated beaker nodeset) seems to be not an option because we would need to do it for each supported OS.

ekohl

Thanks for looking into this! I guess I was trying to be too ambitious by using native GHA.

ekohl · 2021-07-16T11:47:17Z

.msync.yml

@@ -1 +1,2 @@
-modulesync_config_version: '3.0.0'
+---
+modulesync_config_version: '4.0.0'


Can we update to 4.1.0? :)

spec/spec_helper_acceptance.rb

ekohl · 2021-07-16T12:07:53Z

Let's see if I broke it again with my latest change. Feel free to drop that commit if it doesn't.

ekohl · 2021-07-16T12:10:43Z

spec/spec_helper_acceptance.rb

@@ -1,66 +1,7 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'

+ENV['BEAKER_FACTER_GITLAB_IP'] = File.read(File.expand_path('~/GITLAB_IP')).chomp


https://github.com/voxpupuli/voxpupuli-acceptance/#environment-variables-to-facts

I also thought about doing it in the workflow file but I think this is better for users who want to run it outside of GHA.

ekohl · 2021-07-16T12:11:34Z

spec/setup_acceptance_node.pp

@@ -0,0 +1,48 @@
+# The omnibus installer use the following algorithm to know what to do.


See https://github.com/voxpupuli/voxpupuli-acceptance/#per-host-configuration for how this file is used.

The docker module fails on EL7 so the tests started to fail on this.

The latest docker module hard fails on this since it's detected as Red Hat < 7.

ekohl

I rebased it to modulesync 4.1.0 and also squashed some commits. I think this is now ready to merge if it's green.

This uses features from voxpupuli-acceptance to reduce spec_helper_acceptance's size. Another benefit is that editors recognize the .pp extension and you get syntax highlighting.

This module still has support for Puppet 5 which ships Ruby 2.4. This allows it to install there.

ekohl · 2021-07-16T13:17:56Z

We shouldn't forget to create issues that we've dropped Amazon Linux and EL6 for the changelog.

alexjfisher · 2021-07-16T16:35:05Z

I think the next release will have a substantial release summary. I'm hoping to get PR together based on https://github.com/syseleven/puppet-gitlab_ci_runner/tree/clean-move-to-concat-deferred At the moment, the config file is only written when registering a runner, and any subsequent config changes you make have no effect. There are also plenty of more exotic configurations you can't make whilst registering.

alexjfisher · 2021-07-16T16:37:13Z

For completeness (and mainly because I pinged Trevor and don't want to waste his time!), in #105 I managed to get the docker networking working in the way we originally wanted. Might revisit this at a later date.

alexjfisher · 2021-08-25T18:45:24Z

We shouldn't forget to create issues that we've dropped Amazon Linux and EL6 for the changelog.

Done via #118

alexjfisher added the modulesync label Jul 15, 2021

alexjfisher force-pushed the modulesync branch from abd84c8 to 22d47c5 Compare July 15, 2021 15:02

alexjfisher closed this Jul 15, 2021

alexjfisher reopened this Jul 15, 2021

alexjfisher force-pushed the modulesync branch 4 times, most recently from 8e7721d to 3b09d45 Compare July 15, 2021 21:01

alexjfisher force-pushed the modulesync branch from 04429c1 to 76c5594 Compare July 16, 2021 11:17

ekohl reviewed Jul 16, 2021

View reviewed changes

ekohl force-pushed the modulesync branch from 2048da6 to 20a916e Compare July 16, 2021 12:08

ekohl reviewed Jul 16, 2021

View reviewed changes

bastelfreak and others added 3 commits July 16, 2021 14:41

add translate module as dependency

43bba0a

Drop EL6 support

52aa0da

The docker module fails on EL7 so the tests started to fail on this.

Drop Amazon Linux support

2d7ed96

The latest docker module hard fails on this since it's detected as Red Hat < 7.

ekohl force-pushed the modulesync branch from 20a916e to 499e31d Compare July 16, 2021 12:43

ekohl approved these changes Jul 16, 2021

View reviewed changes

ekohl and others added 5 commits July 16, 2021 14:44

Modulesync 4.1.0

5c51b2b

Add ruby_task_helper as a task helper

84bc3c2

Bolt config changes due to new version

52f3826

Quote the API response

9a3ecfa

Use setup_acceptance_node.pp

e6f1f29

This uses features from voxpupuli-acceptance to reduce spec_helper_acceptance's size. Another benefit is that editors recognize the .pp extension and you get syntax highlighting.

ekohl force-pushed the modulesync branch from 499e31d to e6f1f29 Compare July 16, 2021 12:45

Only install github_changelog_generator on Ruby 2.5+

7ca95cb

This module still has support for Puppet 5 which ships Ruby 2.4. This allows it to install there.

ekohl force-pushed the modulesync branch from 39a991a to 7ca95cb Compare July 16, 2021 13:04

alexjfisher changed the title ~~Modulesync~~ Fix Github CI and modulesync Jul 16, 2021

alexjfisher changed the title ~~Fix Github CI and modulesync~~ Fix Github CI builds and modulesync Jul 16, 2021

alexjfisher removed the modulesync label Jul 16, 2021

alexjfisher merged commit c89e098 into master Jul 16, 2021

alexjfisher deleted the modulesync branch July 16, 2021 13:15

ekohl added the backwards-incompatible label Jul 16, 2021

alexjfisher mentioned this pull request Jul 20, 2021

Fix broken master CI #103

Closed

alexjfisher mentioned this pull request Aug 25, 2021

Drop RHEL/CentOS 6 and Amazon Linux Support #118

Closed

alexjfisher added the skip-changelog label Aug 25, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Github CI builds and modulesync #104

Fix Github CI builds and modulesync #104

alexjfisher commented Jul 15, 2021 •

edited

Loading

alexjfisher commented Jul 15, 2021 •

edited

Loading

baurmatt commented Jul 16, 2021

ekohl left a comment

ekohl Jul 16, 2021

ekohl commented Jul 16, 2021

ekohl Jul 16, 2021

ekohl Jul 16, 2021

ekohl left a comment

ekohl commented Jul 16, 2021

alexjfisher commented Jul 16, 2021

alexjfisher commented Jul 16, 2021

alexjfisher commented Aug 25, 2021

		@@ -1,66 +1,7 @@
		require 'voxpupuli/acceptance/spec_helper_acceptance'

		ENV['BEAKER_FACTER_GITLAB_IP'] = File.read(File.expand_path('~/GITLAB_IP')).chomp

		@@ -0,0 +1,48 @@
		# The omnibus installer use the following algorithm to know what to do.

Fix Github CI builds and modulesync #104

Fix Github CI builds and modulesync #104

Conversation

alexjfisher commented Jul 15, 2021 • edited Loading

alexjfisher commented Jul 15, 2021 • edited Loading

baurmatt commented Jul 16, 2021

ekohl left a comment

Choose a reason for hiding this comment

ekohl Jul 16, 2021

Choose a reason for hiding this comment

ekohl commented Jul 16, 2021

ekohl Jul 16, 2021

Choose a reason for hiding this comment

ekohl Jul 16, 2021

Choose a reason for hiding this comment

ekohl left a comment

Choose a reason for hiding this comment

ekohl commented Jul 16, 2021

alexjfisher commented Jul 16, 2021

alexjfisher commented Jul 16, 2021

alexjfisher commented Aug 25, 2021

alexjfisher commented Jul 15, 2021 •

edited

Loading

alexjfisher commented Jul 15, 2021 •

edited

Loading