From 066724a30bd5de7d4e02340d124d4568f3459f79 Mon Sep 17 00:00:00 2001 From: Vikas Yadav Date: Thu, 18 Jun 2026 13:45:20 +0530 Subject: [PATCH 1/3] erlang update Signed-off-by: Vikas Yadav --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f6967518f2..25a39695ef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "omnibus"] path = omnibus url = https://github.com/chef/chef-server-omnibus-config.git - branch = main + branch = vikas/erl-update From 3bb72fc86ba836338f0989707fed69ed403fd37f Mon Sep 17 00:00:00 2001 From: Vikas Yadav Date: Thu, 18 Jun 2026 17:36:49 +0530 Subject: [PATCH 2/3] fixing the asdf install. Signed-off-by: Vikas Yadav --- scripts/bk_tests/bk_install.sh | 6 +++--- src/bookshelf/rebar.config | 2 +- src/oc_bifrost/rebar.config | 2 +- src/oc_erchef/rebar.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/bk_tests/bk_install.sh b/scripts/bk_tests/bk_install.sh index b08d364fe8..208454aeb2 100755 --- a/scripts/bk_tests/bk_install.sh +++ b/scripts/bk_tests/bk_install.sh @@ -47,9 +47,9 @@ cp /workdir/scripts/bk_tests/pb_hba.conf /etc/postgresql/13/main/pg_hba.conf # the erlang software definition lives in: /omnibus-software/config/software/erlang.rb # this is needed until the erlang version is installed in the docker container -echo "Installing erlang 26.2.5.15" -asdf install erlang 26.2.5.15 -asdf local erlang 26.2.5.15 +echo "Installing erlang 26.2.5.21" +asdf install erlang 26.2.5.21 +asdf local erlang 26.2.5.21 erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell echo "Installing Bundler" diff --git a/src/bookshelf/rebar.config b/src/bookshelf/rebar.config index ddaf22033f..a83e8509df 100644 --- a/src/bookshelf/rebar.config +++ b/src/bookshelf/rebar.config @@ -2,7 +2,7 @@ %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et -{require_otp_vsn, "26.2.5.15"}. +{require_otp_vsn, "26.2.5.21"}. {erl_dep_retries, 10}. diff --git a/src/oc_bifrost/rebar.config b/src/oc_bifrost/rebar.config index 4da1152c86..38d0e10bcf 100644 --- a/src/oc_bifrost/rebar.config +++ b/src/oc_bifrost/rebar.config @@ -9,7 +9,7 @@ ]}. {erl_first_files, ["src/bifrost_wm.erl"]}. -{require_otp_vsn, "26.2.5.15"}. +{require_otp_vsn, "26.2.5.21"}. {deps, [ %% lager has to come first since we use its parse transform diff --git a/src/oc_erchef/rebar.config b/src/oc_erchef/rebar.config index d23c41063b..d967a875bd 100644 --- a/src/oc_erchef/rebar.config +++ b/src/oc_erchef/rebar.config @@ -2,7 +2,7 @@ %% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*- %% ex: ts=4 sw=4 ft=erlang et -{require_otp_vsn, "26.2.5.15"}. +{require_otp_vsn, "26.2.5.21"}. {deps, [ %% lager has to come first since we use its parse transform From fa079ca09b66ccd4a6f1ca77fab371118399c528 Mon Sep 17 00:00:00 2001 From: sreepuramsudheer Date: Wed, 24 Jun 2026 19:08:23 +0530 Subject: [PATCH 3/3] omnibus sync. Signed-off-by: sreepuramsudheer --- .gitmodules | 2 +- omnibus | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 25a39695ef..f6967518f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "omnibus"] path = omnibus url = https://github.com/chef/chef-server-omnibus-config.git - branch = vikas/erl-update + branch = main diff --git a/omnibus b/omnibus index eca01c6f94..5dec29eb7b 160000 --- a/omnibus +++ b/omnibus @@ -1 +1 @@ -Subproject commit eca01c6f94807d2548862274b41b534aa512a0b5 +Subproject commit 5dec29eb7b4ea52274f5bc5a1d65a0deb6d67e05