Skip to content

Rebuild/chef 32135 lbaker 20260430 092319#4175

Open
lbakerchef wants to merge 4 commits intomainfrom
rebuild/CHEF-32135-lbaker-20260430-092319
Open

Rebuild/chef 32135 lbaker 20260430 092319#4175
lbakerchef wants to merge 4 commits intomainfrom
rebuild/CHEF-32135-lbaker-20260430-092319

Conversation

@lbakerchef
Copy link
Copy Markdown
Contributor

Description

[Please describe what this change achieves]

Issues Resolved

[List any existing issues this PR resolves, or any Discourse or
StackOverflow discussions that are relevant]

Check List

@lbakerchef lbakerchef requested review from a team as code owners May 1, 2026 08:00
@lbakerchef lbakerchef self-assigned this May 1, 2026
@netlify
Copy link
Copy Markdown

netlify Bot commented May 1, 2026

👷 Deploy Preview for chef-server processing.

Name Link
🔨 Latest commit 5dc550e
🔍 Latest deploy log https://app.netlify.com/projects/chef-server/deploys/69f8d5d6b35a1700089d0365

@lbakerchef lbakerchef force-pushed the rebuild/CHEF-32135-lbaker-20260430-092319 branch from 76688fe to e0f26be Compare May 1, 2026 14:25
Comment thread omnibus_overrides.rb

override :nokogiri, version: "1.18.9"
override :openssl, version: "3.2.4", fips_version: "3.1.2", fips_enabled: true
override :openssl, fips_version: "3.1.2", fips_enabled: true
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Please check the fips version in the adhoc build logs to confirm all are inline.

@lbakerchef lbakerchef force-pushed the rebuild/CHEF-32135-lbaker-20260430-092319 branch from e0f26be to e0382f1 Compare May 4, 2026 16:30
lbakerchef and others added 4 commits May 4, 2026 12:22
Point the omnibus submodule at the fresh omnibus-config rebuild branch and remove erlang, openresty, and OpenSSL version pins that would shadow the rebuilt software definitions.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
Reproduce the Erlang 26.2.5.15 build-helper and rebar.config updates from the original branch on the fresh rebuild branch.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
1. STOP. Both of the following must be done before proceeding, in this order:
   a. omnibus-software-private rebuild branch must have merged to main
   b. chef-server-omnibus-config rebuild branch must have merged to main
   Do not proceed until BOTH are confirmed.

2. Remove this commit:
   git reset --hard HEAD^
   (This leaves commit A — ".gitmodules points to main" — as the tip.)

3. Advance the omnibus submodule SHA to the new omnibus-config main HEAD:
   cd omnibus
   git fetch origin
   git checkout main
   git pull origin main
   cd ..
   git add omnibus
   git commit -sm "Advance omnibus submodule to post-merge omnibus-config main HEAD"

4. git push origin <chef-server-pr-merge-branch>
   Then open/merge the PR on github.com/chef/chef-server.

Signed-off-by: Lincoln Baker <51833247+lbakerchef@users.noreply.github.com>
@lbakerchef lbakerchef force-pushed the rebuild/CHEF-32135-lbaker-20260430-092319 branch from e0382f1 to 5dc550e Compare May 4, 2026 17:22
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented May 4, 2026

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.

2 participants