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.

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

feat(pkg) add 'mirrorbrain' user back under puppet management #3357

Merged

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Mar 28, 2024

Related to jenkins-infra/helpdesk#3414 (comment)

This PR fixes #3351 by putting back the mirrorbrain user under puppet management and also manages the .azure-storage-env with the current values from resources managed in https://github.com/jenkins-infra/azure/blob/main/get.jenkins.io.tf.

Added resources comes from #2185.

Tested locally with vagrant but of course there could be a configuration shift with production: before merging, the puppet agent on pkg VM must be disabled and stopped. Once merged, a puppet noop command is needed to compare the expected changes (and avoid breaking the current setup which is manually managed).

Note that a manual cleanup is required after this PR is applied. The following files will have to be removed:

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal
Copy link
Contributor Author

Puppet agent disabled on the pkg VM. But please don't merge if approved.

lemeurherve
lemeurherve previously approved these changes Mar 28, 2024
Copy link
Member

@lemeurherve lemeurherve left a comment

Choose a reason for hiding this comment

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

🎉

dist/profile/manifests/pkgrepo.pp Outdated Show resolved Hide resolved
dist/profile/manifests/pkgrepo.pp Outdated Show resolved Hide resolved
dist/profile/manifests/pkgrepo.pp Outdated Show resolved Hide resolved
Co-authored-by: Hervé Le Meur <91831478+lemeurherve@users.noreply.github.com>
lemeurherve
lemeurherve previously approved these changes Mar 28, 2024
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal dduportal merged commit 9d388e8 into jenkins-infra:production Mar 29, 2024
2 checks passed
@dduportal dduportal deleted the feat/pkg/mirrorbrain-user branch March 29, 2024 06:33
@dduportal
Copy link
Contributor Author

Deployment result:

  • ✅ Puppet agent execution reported:
Mar 29 06:39:00 ip-172-31-33-96 puppet-agent[13349]: (/Stage[main]/Profile::Pkgrepo/File[/var/www/pkg.jenkins.io/redhat-stable/jenkins.io.key]/content) content changed <redacted> (corrective)
Mar 29 06:39:01 ip-172-31-33-96 puppet-agent[13349]: (/Stage[main]/Profile::Pkgrepo/File[/srv/releases/.ssh/archives]/content) content changed <redacted>
Mar 29 06:39:01 ip-172-31-33-96 puppet-agent[13349]: (/Stage[main]/Profile::Pkgrepo/File[/srv/releases/.ssh/config]/content) content changed <redacted>
Mar 29 06:39:01 ip-172-31-33-96 puppet-agent[13349]: (/Stage[main]/Profile::Pkgrepo/File[/srv/releases/.azure-storage-env]/group) group changed 'root' to 'mirrorbrain'
Mar 29 06:39:01 ip-172-31-33-96 puppet-agent[13349]: (/Stage[main]/Profile::Pkgrepo/File[/srv/releases/.azure-storage-env]/mode) mode changed '0644' to '0600'
  • ✅ Tried changing the mirrorbrain crontab: the 2nd puppet agent execution removed my change (as expected)

  • sync.sh manual execution:

+ echo '>> Script sync.sh finished'
+ exit 0

real    1m38.052s
user    1m44.130s
sys     0m19.152s
  • ✅ Update center ran without any issues

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[pkg.origin.jenkins.io] User mirrorbrain is unmanaged
2 participants