Skip to content

Update CI scripts from master (3.27) - #2378

Merged
craigcomstock merged 5 commits into
cfengine:3.27.xfrom
craigcomstock:ent-14330/3.27
Jul 29, 2026
Merged

Update CI scripts from master (3.27)#2378
craigcomstock merged 5 commits into
cfengine:3.27.xfrom
craigcomstock:ent-14330/3.27

Conversation

@craigcomstock

Copy link
Copy Markdown
Contributor

There have been many changes and all of them should likely be cherry picked but I don't want to bother finding them all.

The ci directory is pretty safe to just pull en-masse from master.

In ENT-11241 and ENT-14330 we migrated to running setup-cfengine-build-host.sh in several important CI jobs so the updates need to be in all LTS branches.

Ticket: ENT-14330
Changelog: none

@craigcomstock

Copy link
Copy Markdown
Contributor Author

@cf-bottom jenkins no tests

@cf-bottom

Copy link
Copy Markdown

@craigcomstock

Copy link
Copy Markdown
Contributor Author

@cf-bottom jenkins no tests

@cf-bottom

Copy link
Copy Markdown

There have been many changes and all of them should likely be cherry picked but I don't want to bother finding them all.

The ci directory is pretty safe to just pull en-masse from master.

In ENT-11241 and ENT-14330 we migrated to running setup-cfengine-build-host.sh in several important CI jobs so the updates need to be in all LTS branches.

Ticket: ENT-14330
Changelog: none

 Conflicts:
	ci/fix-buildhost.sh
The symlink step was failing due to the tarball itself matching the glob

Ticket: none
Changelog: none
(cherry picked from commit f3c42b2)
@craigcomstock

Copy link
Copy Markdown
Contributor Author

@cf-bottom jenkins no tests

@cf-bottom

Copy link
Copy Markdown

… conditions when operating on jenkins files

Happened once that chown -R jenkins /home/jenkins complained of missing files.

Ticket: none
Changelog: none
@craigcomstock

Copy link
Copy Markdown
Contributor Author

retry of ubu22hub saw no issue with setup-cfengine-build-host race condition on chowning files to jenkins.

@cf-bottom jenkins no tests again please

@cf-bottom

Copy link
Copy Markdown

Some find commands require a path to search in.

Ticket: ENT-11241
Changelog: none
(cherry picked from commit dd61423)
@craigcomstock

craigcomstock commented Jul 29, 2026

Copy link
Copy Markdown
Contributor Author

ci is green. ready to go. https://ci.cfengine.com/job/pr-pipeline/14352/ (green but badges aren't quite working currently)

@craigcomstock
craigcomstock marked this pull request as ready for review July 29, 2026 13:27
$(pwd) was the jenkins workspace directory which does not have proxy-target.txt so revert back to $HOME

rhel/centos-7 need centos-7-setup-devtoolset-11.sh and also realpath to find the right place to source.
Limit that to hosts which have realpath and fail fast on rhel/centos-7 hosts that do not have realpath available.

Ticket: ENT-11241
Changelog: none
(cherry picked from commit dbc1efb)
@craigcomstock
craigcomstock merged commit 7c2b3cd into cfengine:3.27.x Jul 29, 2026
@craigcomstock
craigcomstock deleted the ent-14330/3.27 branch July 29, 2026 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants