From 0050e526124b83525c12882e6c8133734d02c256 Mon Sep 17 00:00:00 2001 From: RoyShravani Date: Mon, 28 Oct 2024 12:42:35 +0530 Subject: [PATCH 1/4] pointing to LTS channel for core deps Signed-off-by: RoyShravani testing with LTS-2024 Signed-off-by: RoyShravani adding studio secrets adding studio secretes Signed-off-by: RoyShravani --- .expeditor/build.habitat.yml | 13 +++++++++++++ .expeditor/config.yml | 1 + .expeditor/create_manifest.rb | 2 +- .license_scout.yml | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index 250593e694..d38bcabf30 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -1,4 +1,17 @@ --- +env: + HAB_BLDR_CHANNEL: "LTS-2024" + HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024" + HAB_FALLBACK_CHANNEL: "LTS-2024" origin: chef smart_build: false +studio_secrets: + HAB_BLDR_CHANNEL: + value: "LTS-2024" + HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: + value: "LTS-2024" + HAB_FALLBACK_CHANNEL: + value: "LTS-2024" + + diff --git a/.expeditor/config.yml b/.expeditor/config.yml index e0f372069b..aca47c4c84 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -129,3 +129,4 @@ artifact_channels: - unstable - current - stable + - LTS-2024 diff --git a/.expeditor/create_manifest.rb b/.expeditor/create_manifest.rb index 7a66319f45..fca0f56f58 100755 --- a/.expeditor/create_manifest.rb +++ b/.expeditor/create_manifest.rb @@ -26,7 +26,7 @@ def get_latest(channel, origin, name) def get_hab_deps_latest() ret = {} ["hab", "hab-sup", "hab-launcher"].each do |name| - d = get_latest("stable", "core", name) + d = get_latest("LTS-2024", "core", name) ret[name] = "#{d["origin"]}/#{d["name"]}/#{d["version"]}/#{d["release"]}" end ret diff --git a/.license_scout.yml b/.license_scout.yml index 0e63904ddf..c7ee850fe2 100644 --- a/.license_scout.yml +++ b/.license_scout.yml @@ -15,7 +15,7 @@ habitat: - origin: chef channel: unstable - origin: core - channel: stable + channel: LTS-2024 allowed_licenses: - Apache-1.0 From ade2a8a05d42a1f2a830ff428b75992bd6de8ba9 Mon Sep 17 00:00:00 2001 From: RoyShravani Date: Thu, 19 Dec 2024 16:22:10 +0530 Subject: [PATCH 2/4] adding LTS-2024 packages Signed-off-by: RoyShravani --- src/oc-id/habitat/plan.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/oc-id/habitat/plan.sh b/src/oc-id/habitat/plan.sh index b00dc7f8f4..da1a157ae3 100644 --- a/src/oc-id/habitat/plan.sh +++ b/src/oc-id/habitat/plan.sh @@ -3,10 +3,10 @@ pkg_origin=chef pkg_maintainer="The Chef Server Maintainers " pkg_license=('Apache-2.0') pkg_deps=( - core/sqitch_pg + core/sqitch core/curl - core/node14 - core/ruby31/3.1.6/20240912144513 + core/node + core/ruby3_1 core/rsync core/sed core/libffi From b8fca04dc5ad383e7a4408bac7750bf51c6ba3ca Mon Sep 17 00:00:00 2001 From: RoyShravani Date: Mon, 23 Dec 2024 13:00:25 +0530 Subject: [PATCH 3/4] upgrading to ruby3_4 --- src/oc-id/habitat/plan.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/oc-id/habitat/plan.sh b/src/oc-id/habitat/plan.sh index da1a157ae3..6bb1059116 100644 --- a/src/oc-id/habitat/plan.sh +++ b/src/oc-id/habitat/plan.sh @@ -6,7 +6,7 @@ pkg_deps=( core/sqitch core/curl core/node - core/ruby3_1 + core/ruby3_4 core/rsync core/sed core/libffi @@ -102,7 +102,10 @@ do_install() { --with-xml2-lib=$(pkg_path_for core/libxml2)/lib \ --with-xslt-include=$(pkg_path_for core/libxslt)/include/libxslt \ --with-xslt-lib=$(pkg_path_for core/libxslt)/lib - bundle install --path "${HOME}/vendor/bundle" --binstubs="${HOME}/bin" --shebang ruby --deployment + bundle config set path "${HOME}/vendor/bundle" + bundle config set deployment 'true' + bundle config set --local shebang 'ruby' + bundle install --binstubs="${HOME}/bin" # fix tzdata location echo "Adding core/tzdata zoneinfo search path to tzinfo gem" grep -l DEFAULT_SEARCH_PATH $HOME/vendor/bundle/ruby/*/gems/tzinfo*/lib/tzinfo/zoneinfo_data_source.rb | while read -r f; do From 4701683508c238c0b70af0b54d544825a2ddd50c Mon Sep 17 00:00:00 2001 From: RoyShravani Date: Thu, 26 Dec 2024 10:12:35 +0530 Subject: [PATCH 4/4] adding pg-client as a dependency Signed-off-by: RoyShravani --- .expeditor/create_manifest.rb | 2 +- src/oc-id/habitat/plan.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.expeditor/create_manifest.rb b/.expeditor/create_manifest.rb index fca0f56f58..c9f7638014 100755 --- a/.expeditor/create_manifest.rb +++ b/.expeditor/create_manifest.rb @@ -78,7 +78,7 @@ def get_hab_deps_latest() # that were part of the build group. Pulling from unstable means # that we might include packages that were built as part of an # ad-hoc run of the pipeline or a concurrently running build. - latest_release = get_latest("unstable", pkg_origin, pkg_name) + latest_release = get_latest("LTS-2024", pkg_origin, pkg_name) pkg_version = latest_release["version"] pkg_release = latest_release["release"] diff --git a/src/oc-id/habitat/plan.sh b/src/oc-id/habitat/plan.sh index 6bb1059116..e10f5ecd9a 100644 --- a/src/oc-id/habitat/plan.sh +++ b/src/oc-id/habitat/plan.sh @@ -4,6 +4,7 @@ pkg_maintainer="The Chef Server Maintainers " pkg_license=('Apache-2.0') pkg_deps=( core/sqitch + core/postgresql17-client core/curl core/node core/ruby3_4