diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 08226261a3..492b212442 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -11,16 +11,16 @@ export HAB_STUDIO_SECRET_HAB_FEAT_IGNORE_LOCAL=false export HAB_FEAT_IGNORE_LOCAL=false export HAB_STUDIO_HOST_ARCH=x86_64-linux export HAB_FEAT_OFFLINE_INSTALL=true -export HAB_BLDR_CHANNEL: "LTS-2024" -export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024" -export HAB_FALLBACK_CHANNEL: "LTS-2024" +export HAB_BLDR_CHANNEL="LTS-2024" +export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL="LTS-2024" +export HAB_FALLBACK_CHANNEL="dev" curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash -sudo -E hab pkg install core/ruby +sudo -E hab pkg install core/ruby3_4 export PATH -PATH="$(hab pkg path core/ruby)/bin:$PATH" -sudo -E "$(hab pkg path core/ruby)"/bin/gem install toml +PATH="$(hab pkg path core/ruby3_4)/bin:$PATH" +sudo -E "$(hab pkg path core/ruby3_4)"/bin/gem install toml export JOB_TEMP_ROOT JOB_TEMP_ROOT=$(mktemp -d /tmp/job-root-XXXXXX) @@ -30,7 +30,8 @@ HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" echo "--- :key: Generating fake origin key" hab license accept hab origin key generate - +export HAB_BLDR_CHANNEL=LTS-2024 +export HAB_REFRESH_CHANNEL=LTS-2024 for pkg_name in `echo "bookshelf chef-server-ctl oc-id oc_bifrost oc_erchef openresty-noroot"` do echo "generating package for $pkg_name" @@ -40,11 +41,13 @@ done ./.expeditor/replace.sh "nginx" "src" echo "generating package for nginx" -openresty_hart=$(ls -1t results/chef-openresty*.hart | head -1) -HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $openresty_hart; hab pkg build src/nginx" +openresty_hart=$(ls -1t results/*openresty*.hart | head -1) +HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $openresty_hart; export HAB_REFRESH_CHANNEL=LTS-2024; hab pkg build src/nginx" git clone https://github.com/chef/automate.git cd automate +git checkout vikas/LTS-pipeline +# git checkout dave/LTS-channel # this is the branch that has the changes for LTS channel RESOLVED_RESULTS_DIR=$(realpath results/) export DO_CHECK=true @@ -60,16 +63,16 @@ oc_id=$(ls -1t results/chef-oc_id*.hart | head -1) bifrost_hart=$(ls -1t results/chef-oc_bifrost*.hart | head -1) erchef_hart=$(ls -1t results/chef-oc_erchef*.hart | head -1) +#No releases of chef/automate-scaffolding exist in the 'LTS-2024' channel== this is for bookshelf. +HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $bookshelf_hart; export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL=dev; hab pkg build components/automate-cs-bookshelf" -HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $bookshelf_hart; hab pkg build components/automate-cs-bookshelf" - -HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $bifrost_hart; hab pkg build components/automate-cs-oc-bifrost" +HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $bifrost_hart; export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL=dev; hab pkg build components/automate-cs-oc-bifrost" -HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $erchef_hart; hab pkg build components/automate-cs-oc-erchef" +HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $erchef_hart; export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL=dev; hab pkg build components/automate-cs-oc-erchef" -HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $oc_id; hab pkg build components/automate-cs-ocid" +HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $oc_id; export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL=dev; hab pkg build components/automate-cs-ocid" -HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $nginx; hab pkg build components/automate-cs-nginx" +HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $nginx; export HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL=dev; hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index d38bcabf30..1c8fde4933 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -2,7 +2,7 @@ env: HAB_BLDR_CHANNEL: "LTS-2024" HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "LTS-2024" - HAB_FALLBACK_CHANNEL: "LTS-2024" + HAB_FALLBACK_CHANNEL: "dev" origin: chef smart_build: false @@ -10,8 +10,8 @@ studio_secrets: HAB_BLDR_CHANNEL: value: "LTS-2024" HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: - value: "LTS-2024" + value: "dev" HAB_FALLBACK_CHANNEL: - value: "LTS-2024" + value: "dev" diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 7c7d3cc809..d0e72419d3 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -184,7 +184,10 @@ steps: ALLOW_LOCAL_PACKAGES: true HAB_STUDIO_SUP: false HAB_NONINTERACTIVE: true + HAB_REFRESH_CHANNEL: LTS-2024 GOPROXY: "https://proxy.golang.org,direct" + HAB_BLDR_CHANNEL: LTS-2024 + HAB_FALLBACK_CHANNEL: "dev" expeditor: secrets: HAB_STUDIO_SECRET_GITHUB_TOKEN: diff --git a/src/bookshelf/habitat/plan.sh b/src/bookshelf/habitat/plan.sh index 6520afacf7..00fe9f610f 100644 --- a/src/bookshelf/habitat/plan.sh +++ b/src/bookshelf/habitat/plan.sh @@ -8,7 +8,7 @@ pkg_deps=( core/coreutils core/gcc-libs core/sqitch - core/postgresql-client + core/postgresql17-client ) pkg_build_deps=(core/make core/git core/gcc) pkg_bin_dirs=(bin) diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index d444489e16..898735d825 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -495,10 +495,11 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.6.2) + mini_portile2 (~> 2.8.0) sqlite3-ruby (1.3.3) sqlite3 (>= 1.3.3) sslshake (1.3.1) - stringio (3.0.6) + stringio (3.1.2) strings (0.2.1) strings-ansi (~> 0.2) unicode-display_width (>= 1.5, < 3.0) diff --git a/src/oc-id/habitat/plan.sh b/src/oc-id/habitat/plan.sh index 6ff93f68bf..e10f5ecd9a 100644 --- a/src/oc-id/habitat/plan.sh +++ b/src/oc-id/habitat/plan.sh @@ -4,10 +4,10 @@ pkg_maintainer="The Chef Server Maintainers " pkg_license=('Apache-2.0') pkg_deps=( core/sqitch - core/postgresql-client + core/postgresql17-client core/curl - core/node14 - core/ruby30 + core/node + core/ruby3_4 core/rsync core/sed core/libffi @@ -103,7 +103,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 diff --git a/src/oc_bifrost/habitat/plan.sh b/src/oc_bifrost/habitat/plan.sh index 8b04447bfe..ad6c959b63 100644 --- a/src/oc_bifrost/habitat/plan.sh +++ b/src/oc_bifrost/habitat/plan.sh @@ -9,7 +9,7 @@ pkg_deps=( core/curl core/gcc-libs core/sqitch - core/postgresql-client + core/postgresql17-client ) pkg_build_deps=(core/make core/git core/gcc) pkg_bin_dirs=(bin) diff --git a/src/oc_erchef/habitat/plan.sh b/src/oc_erchef/habitat/plan.sh index c0f5c9221d..2ad4b57659 100644 --- a/src/oc_erchef/habitat/plan.sh +++ b/src/oc_erchef/habitat/plan.sh @@ -11,7 +11,7 @@ pkg_deps=( core/gcc-libs core/ruby3_4 core/sqitch - core/postgresql-client + core/postgresql17-client core/gecode3 core/libffi core/glibc