From 90f1f196694dab7a5c00b5bf6ae147341b152448 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 11:01:26 +0530 Subject: [PATCH 01/31] adding config for nginx and fixing pipeline. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 6 +++--- src/nginx/habitat/plan.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 08226261a3..9e72aefe39 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -11,9 +11,9 @@ 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="LTS-2024" curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash diff --git a/src/nginx/habitat/plan.sh b/src/nginx/habitat/plan.sh index 37a25cc0d2..7f21f191d9 100644 --- a/src/nginx/habitat/plan.sh +++ b/src/nginx/habitat/plan.sh @@ -5,7 +5,7 @@ pkg_license=('Apache-2.0') pkg_deps=( core/curl core/libossp-uuid - "${HAB_ORIGIN:-chef}/openresty-noroot" + "talktovikas/openresty-noroot" ) pkg_build_deps=() pkg_exposes=(port ssl-port) From e3aa7b829c6f37ed7ac4314f48f1d149ca1e29cd Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 11:08:29 +0530 Subject: [PATCH 02/31] changing ruby versions Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 9e72aefe39..99ba37700b 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -17,10 +17,10 @@ export HAB_FALLBACK_CHANNEL="LTS-2024" 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) @@ -40,7 +40,7 @@ done ./.expeditor/replace.sh "nginx" "src" echo "generating package for nginx" -openresty_hart=$(ls -1t results/chef-openresty*.hart | head -1) +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=dev hab studio run -D "set -e; hab pkg install $openresty_hart; hab pkg build src/nginx" git clone https://github.com/chef/automate.git From 319f1158814537c3ef19248a972f8cac280433e4 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 11:16:24 +0530 Subject: [PATCH 03/31] adding psql-17-client from LTS Signed-off-by: talktovikas --- src/bookshelf/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From cbac837c736a09d240090796b140f1edff348364 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 11:41:44 +0530 Subject: [PATCH 04/31] oc-id changes from Shravani branch. Signed-off-by: talktovikas --- src/oc-id/Gemfile.lock | 2 +- src/oc-id/habitat/plan.sh | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index d444489e16..93d51e7a32 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -498,7 +498,7 @@ GEM 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 From 438c49cd9eb76ed726d245dd9faddc1c9df16ab7 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 13:25:11 +0530 Subject: [PATCH 05/31] fixing dep in oc-id. Signed-off-by: talktovikas --- src/oc-id/Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock index 93d51e7a32..898735d825 100644 --- a/src/oc-id/Gemfile.lock +++ b/src/oc-id/Gemfile.lock @@ -495,6 +495,7 @@ 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) From e91e48f0aeb7035b3ce92d3bbc8bc3227e00ae03 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 13:40:25 +0530 Subject: [PATCH 06/31] adding LTS client to bifrost. Signed-off-by: talktovikas --- src/oc_bifrost/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From bafc289ecaa0af0350694aa05e3e53794763c977 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 14:24:20 +0530 Subject: [PATCH 07/31] added erchef-postgres client. Signed-off-by: talktovikas --- src/oc_erchef/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2f61294775819fc5416358d1af43b4889fb1acb0 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 9 Jan 2025 19:54:04 +0530 Subject: [PATCH 08/31] fixing nginx. Signed-off-by: talktovikas --- src/nginx/habitat/plan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nginx/habitat/plan.sh b/src/nginx/habitat/plan.sh index 7f21f191d9..37a25cc0d2 100644 --- a/src/nginx/habitat/plan.sh +++ b/src/nginx/habitat/plan.sh @@ -5,7 +5,7 @@ pkg_license=('Apache-2.0') pkg_deps=( core/curl core/libossp-uuid - "talktovikas/openresty-noroot" + "${HAB_ORIGIN:-chef}/openresty-noroot" ) pkg_build_deps=() pkg_exposes=(port ssl-port) From 3b511240d8d5fcbb7c6b1e405c5a8b3036b4ada2 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Fri, 10 Jan 2025 14:55:48 +0530 Subject: [PATCH 09/31] changing the automate branch for automate which have LTS changes. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 99ba37700b..1488e5736f 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -45,6 +45,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA git clone https://github.com/chef/automate.git cd automate +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 From 224b665b2cbbb5998b18b8b2a0dbed10de74ca67 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 23 Jan 2025 12:56:35 +0530 Subject: [PATCH 10/31] removing automate branch Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 1488e5736f..0a7ac4049c 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -45,7 +45,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA git clone https://github.com/chef/automate.git cd automate -git checkout dave/LTS-channel # this is the branch that has the changes for LTS channel +# 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 From 82ab922fee69a578e7405b7093af6280fde2803e Mon Sep 17 00:00:00 2001 From: talktovikas Date: Mon, 27 Jan 2025 12:24:51 +0530 Subject: [PATCH 11/31] TEST:mentioning LTS-channel. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 0a7ac4049c..94906a3852 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -30,7 +30,7 @@ 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 for pkg_name in `echo "bookshelf chef-server-ctl oc-id oc_bifrost oc_erchef openresty-noroot"` do echo "generating package for $pkg_name" From b7471b697bddac1231d93e1212ebf104e4b8ff3b Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 12:45:31 +0530 Subject: [PATCH 12/31] chaning the hab refresh Channel. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 94906a3852..a2c6098e16 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -31,6 +31,7 @@ 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" From 75ec27b7f90b19df907ca6e4b62b8703f2f9c922 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 13:14:43 +0530 Subject: [PATCH 13/31] fixing NGINX. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index a2c6098e16..f5986e9220 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -42,7 +42,7 @@ done echo "generating package for 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=dev hab studio run -D "set -e; hab pkg install $openresty_hart; hab pkg build src/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 studio run -D "set -e; hab pkg install $openresty_hart; hab pkg build src/nginx" git clone https://github.com/chef/automate.git cd automate From 5e919649cca2709ba2013941b3d15697ac504976 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 13:37:42 +0530 Subject: [PATCH 14/31] fixing refresh channel in Nginx. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index f5986e9220..737883b0d5 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -42,7 +42,7 @@ done echo "generating package for 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 studio run -D "set -e; hab pkg install $openresty_hart; hab pkg build src/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 $openresty_hart; hab pkg build src/nginx" git clone https://github.com/chef/automate.git cd automate From 004b2ab47447a9618185d81f94175cbf05466073 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 14:04:52 +0530 Subject: [PATCH 15/31] refresh not working. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- .expeditor/verify.pipeline.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 737883b0d5..ca8fbd8a65 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -42,7 +42,7 @@ done echo "generating package for 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; hab pkg build src/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 $openresty_hart; export HAB_REFRESH_CHANNEL=LTS-2024; hab pkg build src/nginx" git clone https://github.com/chef/automate.git cd automate diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 7c7d3cc809..12b792a4bf 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -184,6 +184,7 @@ steps: ALLOW_LOCAL_PACKAGES: true HAB_STUDIO_SUP: false HAB_NONINTERACTIVE: true + HAB_REFRESH_CHANNEL: LTS-2024 GOPROXY: "https://proxy.golang.org,direct" expeditor: secrets: From b2f361cf4996ae735a54c2e9c812f99af1cc7c05 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 14:40:57 +0530 Subject: [PATCH 16/31] fixing components in Automate Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index ca8fbd8a65..b00b3b24c4 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -63,15 +63,15 @@ bifrost_hart=$(ls -1t results/chef-oc_bifrost*.hart | head -1) erchef_hart=$(ls -1t results/chef-oc_erchef*.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 $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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 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; 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; 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; 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; hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From a7530bd23757058b70f06f561d95dc5517e20422 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 16:50:51 +0530 Subject: [PATCH 17/31] pining bookshelf and bifrost in dev. when in automate. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index b00b3b24c4..4ef4882e79 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -62,10 +62,10 @@ 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=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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 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=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 $erchef_hart; hab pkg build components/automate-cs-oc-erchef" From 5b53c12fc335eddf1a1fb974c9803137d4981a3b Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 18:38:24 +0530 Subject: [PATCH 18/31] fixing automate erchef. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 4ef4882e79..6cca5691f1 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -46,6 +46,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA 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/) @@ -67,11 +68,11 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA 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 $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=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 $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=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 $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=dev hab studio run -D "set -e; hab pkg install $nginx; hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From 3d0efe5c205288a55515a1e757b426df145fcf23 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Tue, 28 Jan 2025 21:59:28 +0530 Subject: [PATCH 19/31] pining the version to fix Nginx in automate work. Signed-off-by: talktovikas --- src/chef-server-ctl/habitat/plan.sh | 10 +++++----- src/openresty-noroot/habitat/plan.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/chef-server-ctl/habitat/plan.sh b/src/chef-server-ctl/habitat/plan.sh index 7b82fadb44..6af579c588 100644 --- a/src/chef-server-ctl/habitat/plan.sh +++ b/src/chef-server-ctl/habitat/plan.sh @@ -3,17 +3,17 @@ pkg_origin=chef pkg_maintainer="The Chef Server Maintainers " pkg_license=('Apache-2.0') pkg_deps=( - core/coreutils + core/coreutils/9.4/20241017111752 core/curl core/jq-static core/ruby3_4 - core/libffi + core/libffi/3.4.4/20241017125515 core/postgresql17-client - core/gcc-libs - core/glibc + core/gcc-libs/12.2.0/20241017104024 + core/glibc/2.36/20241017094131 ) pkg_build_deps=( - core/glibc + core/glibc/2.36/20241017094131 core/git core/diffutils core/patch diff --git a/src/openresty-noroot/habitat/plan.sh b/src/openresty-noroot/habitat/plan.sh index 0a62a310c9..3f2436bf77 100644 --- a/src/openresty-noroot/habitat/plan.sh +++ b/src/openresty-noroot/habitat/plan.sh @@ -10,16 +10,16 @@ pkg_filename=openresty-${pkg_version}.tar.gz pkg_upstream_url=http://openresty.org/ pkg_shasum=79b071e27bdc143d5f401d0dbf504de4420070d867538c5edc2546d0351fd5c0 pkg_deps=( - core/bzip2 - core/coreutils - core/gcc-libs - core/glibc + core/bzip2/1.0.8/20241017112023 + core/coreutils/9.4/20241017111752 + core/gcc-libs/12.2.0/20241017104024 + core/glibc/2.36/20241017094131 core/libxml2 core/libxslt - core/openssl + core/openssl/3.0.9/20241017121505 core/pcre2 core/perl - core/zlib + core/zlib/1.3.1/20241017112207 ) pkg_build_deps=( core/gcc From c25a61a33aaf67aa5b2bc1a22c91ce211c0d72cb Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 12:46:43 +0530 Subject: [PATCH 20/31] fixing fallback dev Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 6cca5691f1..3f49398eb7 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -13,7 +13,7 @@ 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_FALLBACK_CHANNEL="dev" curl https://raw.githubusercontent.com/habitat-sh/habitat/main/components/hab/install.sh | sudo bash @@ -46,7 +46,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA git clone https://github.com/chef/automate.git cd automate -git checkout vikas/LTS-pipeline +# 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/) @@ -64,15 +64,15 @@ 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=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=LTS-2024 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 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=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 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=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 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=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 studio run -D "set -e; hab pkg install $nginx; hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From c4cd9f6c047ff7876f7b6e70bf32355ae5437f9c Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 13:12:55 +0530 Subject: [PATCH 21/31] hab refesh channel at automate. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 3f49398eb7..d86a2cf334 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -64,15 +64,15 @@ 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 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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 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=LTS-2024 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; 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 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; 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 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; 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 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; hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From c1339e3719cddc0b7880517f2fac81c8d0a99c63 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 13:42:39 +0530 Subject: [PATCH 22/31] adding flag to each comp. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index d86a2cf334..7cf46100c3 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -64,15 +64,15 @@ 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; 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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 HAB_FALLBACK_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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 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_FALLBACK_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 $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_FALLBACK_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 $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_FALLBACK_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 $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_FALLBACK_CHANNEL=dev hab studio run -D "set -e; hab pkg install $nginx; hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From 67419eeab85829298192d95d4541a0a73eb8b206 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 14:29:03 +0530 Subject: [PATCH 23/31] adding flags Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 7cf46100c3..817abda12c 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -64,15 +64,15 @@ 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_FALLBACK_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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $bookshelf_hart; export 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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 HAB_FALLBACK_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_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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 HAB_FALLBACK_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_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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 HAB_FALLBACK_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_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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 HAB_FALLBACK_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 pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From a50c91485e4a12a6297187d16dceb815a8414930 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 16:16:14 +0530 Subject: [PATCH 24/31] changing pipeline config. Signed-off-by: talktovikas --- .expeditor/build.habitat.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" From 4a904dc801312114737bf4d6f1ae2de1b1481eb9 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 17:41:43 +0530 Subject: [PATCH 25/31] changing flag Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 817abda12c..9a224cc4ce 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -64,15 +64,15 @@ 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_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=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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $bifrost_hart; export 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=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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $erchef_hart; export 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=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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $oc_id; export 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=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=LTS-2024 HAB_REFRESH_CHANNEL=LTS-2024 hab studio run -D "set -e; hab pkg install $nginx; export 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; export hab pkg build components/automate-cs-nginx" .expeditor/create-manifest.rb mv manifest.json results/build.json From 440d9ccd1fb3f9e5f3cc2f4058e309948cbf4b31 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Thu, 30 Jan 2025 17:48:48 +0530 Subject: [PATCH 26/31] adding new variables in verify pipeline. Signed-off-by: talktovikas --- .expeditor/verify.pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 12b792a4bf..d0e72419d3 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -186,6 +186,8 @@ steps: 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: From d0f1953960bec69002077373aef5414b38959405 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Mon, 3 Feb 2025 15:13:17 +0530 Subject: [PATCH 27/31] using custom pipeline in automate. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 9a224cc4ce..20170616bc 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -46,7 +46,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA git clone https://github.com/chef/automate.git cd automate -# git checkout vikas/LTS-pipeline +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/) From 09c20233a41ec644353b3e833d99d1a187151732 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Mon, 3 Feb 2025 17:29:44 +0530 Subject: [PATCH 28/31] fixing build commnad. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 20170616bc..492b212442 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -72,7 +72,7 @@ HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CA 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=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; export 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 From fd1dfd33ddc2e67a196b2deee3f8756c02d41bf4 Mon Sep 17 00:00:00 2001 From: talktovikas Date: Mon, 3 Feb 2025 18:08:35 +0530 Subject: [PATCH 29/31] unpinning pkg dependencies for automate-cs-nginx. Signed-off-by: talktovikas --- src/chef-server-ctl/habitat/plan.sh | 10 +++++----- src/openresty-noroot/habitat/plan.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/chef-server-ctl/habitat/plan.sh b/src/chef-server-ctl/habitat/plan.sh index 6af579c588..7b82fadb44 100644 --- a/src/chef-server-ctl/habitat/plan.sh +++ b/src/chef-server-ctl/habitat/plan.sh @@ -3,17 +3,17 @@ pkg_origin=chef pkg_maintainer="The Chef Server Maintainers " pkg_license=('Apache-2.0') pkg_deps=( - core/coreutils/9.4/20241017111752 + core/coreutils core/curl core/jq-static core/ruby3_4 - core/libffi/3.4.4/20241017125515 + core/libffi core/postgresql17-client - core/gcc-libs/12.2.0/20241017104024 - core/glibc/2.36/20241017094131 + core/gcc-libs + core/glibc ) pkg_build_deps=( - core/glibc/2.36/20241017094131 + core/glibc core/git core/diffutils core/patch diff --git a/src/openresty-noroot/habitat/plan.sh b/src/openresty-noroot/habitat/plan.sh index 3f2436bf77..0a62a310c9 100644 --- a/src/openresty-noroot/habitat/plan.sh +++ b/src/openresty-noroot/habitat/plan.sh @@ -10,16 +10,16 @@ pkg_filename=openresty-${pkg_version}.tar.gz pkg_upstream_url=http://openresty.org/ pkg_shasum=79b071e27bdc143d5f401d0dbf504de4420070d867538c5edc2546d0351fd5c0 pkg_deps=( - core/bzip2/1.0.8/20241017112023 - core/coreutils/9.4/20241017111752 - core/gcc-libs/12.2.0/20241017104024 - core/glibc/2.36/20241017094131 + core/bzip2 + core/coreutils + core/gcc-libs + core/glibc core/libxml2 core/libxslt - core/openssl/3.0.9/20241017121505 + core/openssl core/pcre2 core/perl - core/zlib/1.3.1/20241017112207 + core/zlib ) pkg_build_deps=( core/gcc From a2e00545eeb052aea7347c9e603bc349388b04cf Mon Sep 17 00:00:00 2001 From: talktovikas Date: Mon, 3 Feb 2025 18:53:13 +0530 Subject: [PATCH 30/31] commenting other components for speed. Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 492b212442..19649146dc 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -64,13 +64,13 @@ 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=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=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=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=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=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=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=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=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" From 2fe5860916de15bdd984bfed822195cb914f802b Mon Sep 17 00:00:00 2001 From: talktovikas Date: Mon, 3 Feb 2025 19:41:26 +0530 Subject: [PATCH 31/31] uncommenting cs-components Signed-off-by: talktovikas --- .expeditor/automate_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.expeditor/automate_build.sh b/.expeditor/automate_build.sh index 19649146dc..492b212442 100755 --- a/.expeditor/automate_build.sh +++ b/.expeditor/automate_build.sh @@ -64,13 +64,13 @@ 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=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=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=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=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=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=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=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=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"