Skip to content

Fix Github CI builds and modulesync#104

Merged
alexjfisher merged 9 commits into
masterfrom
modulesync
Jul 16, 2021
Merged

Fix Github CI builds and modulesync#104
alexjfisher merged 9 commits into
masterfrom
modulesync

Conversation

@alexjfisher
Copy link
Copy Markdown
Member

@alexjfisher alexjfisher commented Jul 15, 2021 •
edited
Loading

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

@alexjfisher alexjfisher added the modulesync PR related to modulesync label Jul 15, 2021
@alexjfisher alexjfisher reopened this Jul 15, 2021
@alexjfisher alexjfisher force-pushed the modulesync branch 4 times, most recently from 8e7721d to 3b09d45 Compare July 15, 2021 21:01
@alexjfisher
Copy link
Copy Markdown
Member Author

alexjfisher commented Jul 15, 2021 •
edited
Loading

@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
Copy link
Copy Markdown
Contributor

baurmatt commented Jul 16, 2021

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
ekohl reviewed Jul 16, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Comment thread .msync.yml Outdated
@@ -1 +1,2 @@
modulesync_config_version: '3.0.0'
---
modulesync_config_version: '4.0.0'
Copy link
Copy Markdown
Member

@ekohl ekohl Jul 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we update to 4.1.0? :)

Comment thread spec/spec_helper_acceptance.rb
@ekohl
Copy link
Copy Markdown
Member

ekohl commented Jul 16, 2021

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

ekohl
ekohl reviewed Jul 16, 2021
View reviewed changes
Comment thread 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
Copy link
Copy Markdown
Member

@ekohl ekohl Jul 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
ekohl reviewed Jul 16, 2021
View reviewed changes
Comment thread spec/setup_acceptance_node.pp
@@ -0,0 +1,48 @@
# The omnibus installer use the following algorithm to know what to do.
Copy link
Copy Markdown
Member

@ekohl ekohl Jul 16, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

bastelfreak and others added 3 commits July 16, 2021 14:41
@bastelfreak @ekohl
add translate module as dependency
43bba0a
@ekohl
Drop EL6 support
52aa0da 
The docker module fails on EL7 so the tests started to fail on this.
@ekohl
Drop Amazon Linux support
2d7ed96 
The latest docker module hard fails on this since it's detected as Red
Hat < 7.
ekohl
ekohl approved these changes Jul 16, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

ekohl and others added 5 commits July 16, 2021 14:44
@ekohl
Modulesync 4.1.0
5c51b2b
@ekohl
Add ruby_task_helper as a task helper
84bc3c2
@baurmatt @ekohl
Bolt config changes due to new version
52f3826
@baurmatt @ekohl
Quote the API response
9a3ecfa
@ekohl
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
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.
@alexjfisher alexjfisher changed the title Modulesync Fix Github CI and modulesync Jul 16, 2021
@alexjfisher alexjfisher changed the title Fix Github CI and modulesync Fix Github CI builds and modulesync Jul 16, 2021
@alexjfisher alexjfisher removed the modulesync PR related to modulesync label Jul 16, 2021
@alexjfisher alexjfisher merged commit c89e098 into master Jul 16, 2021
@alexjfisher alexjfisher deleted the modulesync branch July 16, 2021 13:15
@ekohl
Copy link
Copy Markdown
Member

ekohl commented Jul 16, 2021

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

@ekohl ekohl added the backwards-incompatible This change will lead to a major version bump for the next release label Jul 16, 2021
@alexjfisher
Copy link
Copy Markdown
Member Author

alexjfisher commented Jul 16, 2021

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
Copy link
Copy Markdown
Member Author

alexjfisher commented Jul 16, 2021

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 alexjfisher mentioned this pull request Jul 20, 2021
Closed
@alexjfisher alexjfisher mentioned this pull request Aug 25, 2021
Closed
@alexjfisher alexjfisher added the skip-changelog Excluded from CHANGELOG label Aug 25, 2021
@alexjfisher
Copy link
Copy Markdown
Member Author

alexjfisher commented Aug 25, 2021

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

Done via #118

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@baurmatt baurmatt baurmatt left review comments

@ekohl ekohl ekohl approved these changes

Assignees

No one assigned

Labels

backwards-incompatible This change will lead to a major version bump for the next release skip-changelog Excluded from CHANGELOG

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@alexjfisher @baurmatt @ekohl @bastelfreak