Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LTS channel #8714

Open
wants to merge 172 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
41c2b0c
testCurl8
Jul 2, 2024
2e77a86
testCurl8
Jul 3, 2024
face700
nginx pipeline fix
Jul 3, 2024
7507547
automate-cluster-ctl pipeline fix
Jul 3, 2024
8f37eba
removed pinned version
Jul 15, 2024
78009fa
Rebasing
Sep 9, 2024
fe0efa3
GOlang update to version 1.22.0
Aug 29, 2024
bf5fd28
golang v1.22.5
Aug 29, 2024
c38774d
Modified Go version in all the files
Aug 29, 2024
9d68795
Pipeline check
Aug 29, 2024
c040062
Pipeline check
Aug 29, 2024
6ab0210
Pipeline check
Aug 29, 2024
0c1e7b3
Pipeline check
Aug 29, 2024
84f9386
proto check
Aug 29, 2024
90da8c7
Compiled protobuf with upgraded Golang v1.22.5
Aug 30, 2024
73751c9
Downgraded packages
Aug 30, 2024
f599e06
Protobuf compiles newly added messages and services
Aug 30, 2024
ff31380
Modified go mod downgrading some dependency for authz errors
Aug 30, 2024
1fbba9e
Added GOPROXY
Sep 3, 2024
70b8cc7
GOPROXY
Sep 3, 2024
7678c8a
Downgraded linter
Sep 3, 2024
51bb3dd
Go linter modification
Sep 3, 2024
b35be77
Removed enable unused
Sep 3, 2024
1810ec3
Downgraded protoc-gen-validate
Sep 3, 2024
c463384
package update
Sep 3, 2024
b0c1d16
Downgraded grpc gateway
Sep 3, 2024
68241d7
Regenerated code
Sep 3, 2024
6ea74ab
Added golangci
Sep 3, 2024
c8d828d
Pipeline fix (#8563)
Dmaddu Sep 4, 2024
62614cc
Dave/pipeline fix (#8564)
daveaugustus Sep 4, 2024
12aef68
Checking repo health
Sep 5, 2024
5ab46bc
testing pipeline
Sep 5, 2024
053ce1c
Check with go mod
Sep 6, 2024
1bb332c
testing by upgrading golag
Sep 9, 2024
3525215
testing by upgrading golag
Sep 9, 2024
63a9187
error fixes
iamazzeez Sep 5, 2024
0607e14
commented license scout
iamazzeez Sep 5, 2024
99ca79d
build pipeline fix
iamazzeez Sep 9, 2024
61b9a50
nats version downgrade
iamazzeez Sep 9, 2024
9e23585
nats server upgrade
iamazzeez Sep 9, 2024
1bd1ae0
reverted nates upgrade
iamazzeez Sep 10, 2024
22e16e7
Dave/verify private fix 2 (#8579)
daveaugustus Sep 10, 2024
87fe1ed
added go.sum dependency
Sep 10, 2024
edb355c
license scout fix
iamazzeez Sep 10, 2024
d0df1f5
repo health fix
iamazzeez Sep 10, 2024
2282a35
modified pacnic check
Sep 11, 2024
df9d1fe
Update storage.go
daveaugustus Sep 11, 2024
3468f84
undefined log
Sep 11, 2024
2f9c043
Test
Sep 11, 2024
5026d11
Revised the test cases
Sep 11, 2024
a20ae1f
all go upgrade latest fixes
iamazzeez Sep 12, 2024
bdaf3b0
Pipeline for LTS Channel and go_1_22.4
Sep 18, 2024
43f48c6
Modification in go version
Sep 18, 2024
efae1ce
changed fallback to stable
Sep 18, 2024
9dd6741
Getting correct package for core ruby
Sep 18, 2024
c65e0ff
Getting correct package for core ruby
Sep 18, 2024
27c0851
studio common updated LTS
Sep 18, 2024
65dffbf
Updated git version
Sep 19, 2024
957b387
Commenting a environment variable to pick local builds
Sep 19, 2024
0fa14f3
Testing if ignore local works
Sep 19, 2024
4810558
Testing if ignore local works
Sep 19, 2024
1adaca4
Checking if we can build platform tools by adding do_before function
Sep 19, 2024
3510194
Adding an extra space in scaffolding
Sep 19, 2024
4f90caf
gov1.22.4 to go1.22.5
Sep 19, 2024
9e032b8
ccore-->core
Sep 19, 2024
48c0049
Skipping compliance service build
Sep 19, 2024
634a676
Skipping es-gateway service build
Sep 19, 2024
955a0c0
Skipping components/automate-cs-oc-erchef service build
Sep 19, 2024
e8b34f3
Skipping components/automate-cs-ocid service build
Sep 19, 2024
69c71da
Skipping components/automate-cs-ocid service build
Sep 19, 2024
c5a31a9
Adding components in skip
Sep 19, 2024
2a4bd31
Adding components in skip
Sep 19, 2024
3990e50
Skipping build
Sep 19, 2024
3e0ce49
Adding components in skip
Sep 19, 2024
cc331df
Adding components in skip
Sep 19, 2024
bf4d294
Skipping build
Sep 19, 2024
f305ee5
Skipping build
Sep 19, 2024
420d275
Skipping build
Sep 19, 2024
5b25933
Adding build for hs opensearch
Sep 19, 2024
43d5976
Adding build for hs opensearch
Sep 20, 2024
fe2f99c
skpi components/automate-ha-pgleaderchk
Sep 20, 2024
71dcc1a
skpi components/automate-opensearch
Sep 20, 2024
a9ad7c7
build pg gateway
Sep 23, 2024
09d75af
- Uncommented opensearch
Sep 24, 2024
78bf141
removed automate-backend-elasticsidecar
Aishwarya2001A Sep 25, 2024
89fd4f8
removed automate-backend-opensearch
Aishwarya2001A Sep 25, 2024
8c8ee00
removed automate-builder-api-proxy
Aishwarya2001A Sep 25, 2024
fb9774a
removed automate-builder-api
Aishwarya2001A Sep 25, 2024
cf52a4d
automate-builder-memcached
Aishwarya2001A Sep 25, 2024
fd57708
adding space in automate-debug
Aishwarya2001A Sep 25, 2024
190bf49
removed automate-minio
Aishwarya2001A Sep 26, 2024
99543b1
space
Aishwarya2001A Sep 26, 2024
d8ce3d1
removed automate-cs-ocid
Aishwarya2001A Sep 26, 2024
0547584
removed automate-cs-nginx
Aishwarya2001A Sep 26, 2024
3a2e285
removed automate-cs-oc-erchef
Aishwarya2001A Sep 26, 2024
168dab9
removed automate-es-gateway
Aishwarya2001A Sep 26, 2024
3d3171d
removed compliance-service
Aishwarya2001A Sep 26, 2024
7c6bbb0
adding all skipped components
Aishwarya2001A Sep 26, 2024
cf130e7
build data-life-cycle
swatiganesh Sep 30, 2024
557bacf
build automate-load-balancer
swatiganesh Sep 30, 2024
97605b6
adding all the components which are missed from the build
swatiganesh Sep 30, 2024
7136468
skipping automate-load-balancer
swatiganesh Sep 30, 2024
3d354ed
skipping automate-postgresql
swatiganesh Sep 30, 2024
7d52308
skipping automate-prometheus
swatiganesh Sep 30, 2024
4eff41f
skipping automate-backend-ctl
swatiganesh Sep 30, 2024
b877d14
skipping automate-backend-ctl
swatiganesh Sep 30, 2024
5bc0222
skipping automate-cluster-ctl
swatiganesh Sep 30, 2024
4e895ee
skipping automate-backend-deployment
swatiganesh Sep 30, 2024
c6ce476
adding automate-ui to skip list
swatiganesh Sep 30, 2024
61f4ca9
triggering data-life-cycle again
swatiganesh Sep 30, 2024
37442a6
adding core/pcre2 in the automate-load-balancer
swatiganesh Sep 30, 2024
acfad60
adding core/pcre2 in the automate-load-balancer and removed from skip…
swatiganesh Sep 30, 2024
2aecafb
updating openssl to 3.0.9
swatiganesh Oct 16, 2024
e7c0a3f
updating openssl to 3.0.9 and pcre2 in automate-es-gateway
swatiganesh Oct 16, 2024
1afed44
trigerring pipelines
Aishwarya2001A Oct 21, 2024
a13b7e6
pinning openssl version
Aishwarya2001A Oct 21, 2024
b33fc92
removing pinned version and trigerring lcs
Aishwarya2001A Oct 21, 2024
6407cf0
checking automate-es-gateway
swatiganesh Oct 21, 2024
77d4b72
openssl 3.0.9 in automate-es-gateway
swatiganesh Oct 21, 2024
a892384
updating go.mod
Dec 24, 2024
a674a42
updating go.mod
Dec 24, 2024
329637d
updating go.mod
Dec 24, 2024
8735480
sync go.mod
Dec 24, 2024
d4b12a7
Adding pinged versions
Dec 24, 2024
d2dc141
More packages from stable channel pinged
Dec 24, 2024
d69e0fa
notification service from stable channel
Dec 24, 2024
0a8ca8d
Checking license scout
Dec 26, 2024
afd69ac
fixing verify main pipeline
Sahiba3108 Dec 26, 2024
0ba90db
Adding license scout changes
Dec 26, 2024
756e73c
Adding certs and chcking builds
Dec 26, 2024
92d505f
checking license scout
Dec 26, 2024
98b4c0e
checking license scout
Dec 26, 2024
bcc1559
fixing verify main pipeline
Sahiba3108 Dec 26, 2024
d7be591
SSL_CERT_FILE_ADDED
Sahiba3108 Dec 27, 2024
a405c7a
SSL_CERT_FILE_ADDED
Sahiba3108 Dec 27, 2024
9dfdb4f
Adding pipeline fixes
Dec 30, 2024
def432d
Checking pipeline VCS error
Dec 30, 2024
47636c8
protobuf pipline
Dec 30, 2024
069198f
protobuf
Dec 30, 2024
4f558d2
Adding fix for repo health
Dec 30, 2024
9b69659
Adding correct version of ruby
Dec 30, 2024
ee20d95
Correct protobuf and repo health
Dec 30, 2024
bbfe3bd
Adding git config for automate-gateway
Dec 30, 2024
318de5c
Adding spellcheck older version
Dec 30, 2024
caa405a
Adding spellcheck older version
Dec 30, 2024
97298e9
Removing ssl cert line
Dec 30, 2024
b724a53
exporting ssl cert file
Sahiba3108 Jan 2, 2025
c2376e7
fixing repo health
Sahiba3108 Jan 2, 2025
2527c51
removing more from verify build
Jan 2, 2025
17e69b1
Changing ruby package to ruby3_1
Jan 2, 2025
cc0814f
pinned versions
Sahiba3108 Jan 2, 2025
491f0b7
pinned versions for automate-backend-ctl
Sahiba3108 Jan 2, 2025
8acfa79
ping openssl in load balancer
Jan 2, 2025
c2908b0
Removing openssl 3 dependency
Jan 3, 2025
5224bd5
Removing more components from skip
Jan 3, 2025
32eacc5
Adding correct package of builder
Jan 3, 2025
44a71ff
Pining the postgres client version
Jan 3, 2025
076ed1f
adding ui build
Jan 3, 2025
db6447f
Checking for stable package with curl in product integration tests
Jan 3, 2025
0bad654
Adding build pipeline as well from LTS channel
Jan 6, 2025
a9c9307
Removing go mod changes
Jan 6, 2025
7624f25
Changing the error code
Jan 6, 2025
3347055
Checking the builds
Jan 6, 2025
0d71442
Adding fallback channel as lts
Jan 6, 2025
7670470
Removing skipping components
Jan 6, 2025
ce7d561
Adding knife ec backup and license audit from stable channel
Jan 6, 2025
6a68cd5
correct node18 build
Jan 6, 2025
aaae5ce
changing habitat channel to test channel
Jan 7, 2025
d45954d
Adding infra server packages
Jan 7, 2025
3f52e85
Adding new packages
Jan 17, 2025
969fa5d
Fixing build for HA
Jan 17, 2025
8ab9f38
Changing the packages
Jan 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .expeditor/build.habitat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ studio_secrets:
OPENSEARCH_NODE1_KEY_PEM:
path: secret/a2/a2ha/opensearch
field: node1-key.pem
HAB_BLDR_CHANNEL:
value : "chef-automate-habitat-build-test"
HAB_FALLBACK_CHANNEL:
value: "stable"
value: "LTS-2024"
GOPROXY:
value: "https://proxy.golang.org,direct"
2 changes: 1 addition & 1 deletion .expeditor/generate-automate-cli-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eou pipefail

# bumping expeditor to go 1.22
hab pkg install --binlink core/go22 --force
hab pkg install --binlink core/go1_22 --force

pushd components/automate-cli
make docs
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/license_scout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ gem install license_scout -v 2.5.1
log "Finished Installing License Scout"

log_section_start "Installing Go 1.22.5"
hab pkg install --force --binlink core/go22/1.22.5 && rm -rf /hab/cache && mkdir -p "$GOPATH/src" "$GOPATH/bin"
hab pkg install --force --binlink core/go1_22/1.22.5 && rm -rf /hab/cache && mkdir -p "$GOPATH/src" "$GOPATH/bin"
go version
log "Finished Installing Go 1.22.5"

Expand Down
9 changes: 6 additions & 3 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
env:
DOCKER_CONFIG: /var/lib/buildkite-agent/.docker
HAB_BLDR_CHANNEL: "stable"
HAB_BLDR_CHANNEL: "LTS-2024"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
# Use the Go module mirror and checksum database by default.
# See https://proxy.golang.org for details.
GOPROXY: "https://proxy.golang.org,direct"
GOSUMDB: "sum.golang.org"
PGGSSENCMODE: "disable"

expeditor:
defaults:
Expand Down Expand Up @@ -165,7 +166,7 @@ steps:
- rm -rf /bin/zdump
- rm -rf /bin/sprof
- scripts/install_hab_pkg.sh core/glibc # opa depends implicitly glibc
- scripts/install_hab_pkg.sh core/opa
- scripts/install_hab_pkg.sh core/opa/0.34.2/20240106123544
- cd components/authz-service/engine/opa/policy
- make static unit
timeout_in_minutes: 10
Expand Down Expand Up @@ -301,7 +302,7 @@ steps:
privileged: true

- label: "[unit] automate-gateway"
command:
command:
- hab studio run "source .studiorc && go_component_unit automate-gateway"
- cd components/automate-gateway
- make lint fmt
Expand Down Expand Up @@ -420,6 +421,7 @@ steps:

- label: "[unit] event-feed-service"
command:
- git config --global --add safe.directory /go/src/github.com/chef/automate
- hab studio run "source .studiorc && go_component_unit event-feed-service && go_component_static_tests event-feed-service && go_component_lint event-feed-service"
timeout_in_minutes: 10
retry:
Expand All @@ -435,6 +437,7 @@ steps:

- label: "[unit] ingest-service"
command:
- git config --global --add safe.directory /go/src/github.com/chef/automate
- hab studio run "source .studiorc && go_component_unit ingest-service && go_component_static_tests ingest-service && go_component_lint ingest-service"
timeout_in_minutes: 10
retry:
Expand Down
2 changes: 1 addition & 1 deletion .expeditor/verify_private.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

env:
DOCKER_CONFIG: /var/lib/buildkite-agent/.docker
HAB_BLDR_CHANNEL: "stable"
HAB_BLDR_CHANNEL: "LTS-2024"
#HAB_STUDIO_SECRET_HAB_BLDR_CHANNEL: "curl8"
#HAB_FALLBACK_CHANNEL: "stable"
HAB_STUDIO_SECRET_HAB_FALLBACK_CHANNEL: "stable"
Expand Down
33 changes: 31 additions & 2 deletions .license_scout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ habitat:
- origin: chef
channel: dev
- origin: core
channel: stable
channel: LTS-2024
allowed_licenses:
- 0BSD
- Apache-1.0
Expand Down Expand Up @@ -1535,6 +1535,36 @@ exceptions:
reason: Ruby license (previously shipped in Automate 1)
- name: core/ruby27
reason: Exception made for chef server upgrade
- name: core/acl
reason: Exception made by Chef Legal
- name: core/diffutils
reason: Exception made by Chef Legal
- name: core/file
reason: Exception made by Chef Legal
- name: core/libxau
reason: Exception made by Chef Legal
- name: core/libxcb
reason: Exception made by Chef Legal
- name: core/libxdmcp
reason: Exception made by Chef Legal
- name: core/libxi
reason: Exception made by Chef Legal
- name: core/libxrender
reason: Exception made by Chef Legal
- name: core/libxtst
reason: Exception made by Chef Legal
- name: core/lzo
reason: Exception made by Chef Legal
- name: core/lzop
reason: Exception made by Chef Legal
- name: core/ncurses
reason: Exception made by Chef Legal
- name: core/sqlite
reason: Exception made by Chef Legal
- name: core/ruby3_1
reason: Ruby license (previously shipped in Automate 1)
- name : core/libmpc
reason: Exception made by Chef Legal

ruby:
- name: highline
Expand Down Expand Up @@ -1823,4 +1853,3 @@ exceptions:
reason: Exception made by Chef Legal
- name: golang.org/x/telemetry
reason: Exception made by Chef Legal

14 changes: 9 additions & 5 deletions .studio/common
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ document "verify_products_generation" <<DOC
DOC
function verify_products_generation() {
install_if_missing core/git git

git config --global --add safe.directory /go/src/github.com/chef/automate
git config --global --add safe.directory '*'

deployment_generate || return $?

git add .
Expand Down Expand Up @@ -98,7 +100,7 @@ function link_component_bin() {
}

function desired_golang_ident() {
echo "core/go22/$(cat /src/GOLANG_VERSION)"
echo "core/go1_22/$(cat /src/GOLANG_VERSION)"
}

function verify_components_have_platform_config() {
Expand Down Expand Up @@ -202,13 +204,15 @@ EOF
function build() {
local hab_build
#set HAB_BLDR_CHANNEL to dev as part of the hab package refresh
local HAB_BLDR_CHANNEL=dev
local HAB_BLDR_CHANNEL=LTS-2024

# Support for hab v.0.63.0
if [ -f /bin/build ]; then
hab_build=/bin/build
fi

echo "Building from channel: $HAB_BLDR_CHANNEL"

# Support prior hab versions
if [ -f /hab/bin/build ]; then
hab_build=/hab/bin/build
Expand All @@ -217,7 +221,7 @@ function build() {
if [ -z "$hab_build" ]; then
exit_with "Hab build binary not found. Verify the 'build' wrapper inside the studio." 22
else
HAB_FEAT_IGNORE_LOCAL=true HAB_BLDR_CHANNEL=${HAB_BLDR_CHANNEL:-dev} $hab_build "$@"
HAB_FEAT_IGNORE_LOCAL=false HAB_BLDR_CHANNEL=${HAB_BLDR_CHANNEL:-LTS-2024} $hab_build "$@"
fi
}

Expand Down Expand Up @@ -356,7 +360,7 @@ function build_all_changed_components() {
local whitelist=$*

install_if_missing core/git git
install_if_missing core/ruby ruby
install_if_missing core/ruby/3.0.6/20240108025751 ruby
hab pkg binlink core/ruby gem
gem install toml
hab pkg install core/coreutils >/dev/null
Expand Down
2 changes: 1 addition & 1 deletion .studio/compliance-service
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function load_scan_jobs() {
# shellcheck disable=SC1091
source dev/secrets-env.sh
pushd dev-docs/adding-data &> /dev/null
iinstall_if_missing core/go22 go
iinstall_if_missing core/go1_22/1.22.5 go
go run add_scanjobs.go
popd &> /dev/null
fi
Expand Down
4 changes: 3 additions & 1 deletion .studio/golang
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ DOC
function go_component_unit() {
install_go

GOFLAGS=-buildvcs=false

VERBOSE_TESTS=
if [[ "$1" == "-v" ]]; then
VERBOSE_TESTS=$1
Expand Down Expand Up @@ -271,7 +273,7 @@ function go_component_lint() {
[ "x$1" == "x" ] && error "Missing component name argument; try 'describe ${FUNCNAME[0]}'" && return 1
verify_component $1 || return $?
local component=$1
install_golangci && run_golangci components/$component/...
export GOFLAGS=-buildvcs=false && install_golangci && run_golangci components/$component/...
}

complete -F _component_auto_complete go_component_lint
Expand Down
5 changes: 3 additions & 2 deletions .studio/protobuf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ document "install_protoc_toolchain" <<DOC
Install all the protobuf plugins, linters, etc. we use to compile and vet our protobufs.
DOC
function install_protoc_toolchain() {
install_if_missing core/protobuf-cpp protoc
install_if_missing core/protobuf-cpp/3.19.0/20240106033100 protoc
install_go_tool github.com/golang/protobuf/protoc-gen-go
compile_go_protobuf api/scripts/bootstrap_protoc.sh
compile_go_protobuf components/automate-grpc/scripts/bootstrap_protoc.sh
Expand Down Expand Up @@ -240,7 +240,8 @@ document "verify_all_protobuf_components" <<DOC
DOC
function verify_all_protobuf_components() {
install_if_missing core/git git

git config --global --add safe.directory /go/src/github.com/chef/automate
git config --global --add safe.directory '*'
clean_all_compiled_protos || return $?
bootstrap_proto_compilers || return $?
compile_all_protobuf_components || return $?
Expand Down
5 changes: 3 additions & 2 deletions .studiorc
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RECOMMENDED_HAB_VERSION="1.6.1205"
GOLANGCILINTVERSION=1.60.1

# TODO(ssd) 2019-11-19: https://github.com/habitat-sh/habitat/issues/7219
unset SSL_CERT_FILE
# unset SSL_CERT_FILE

# TODO (tc) Let's get rid of this hard-coded config long-term.
# Opensearch
Expand All @@ -32,7 +32,8 @@ export GATEWAY_PORT=2000
export CGO_ENABLED=0
export GOPROXY="https://proxy.golang.org,direct"
export GOSUMDB="sum.golang.org"

SSL_CERT_FILE="/hab/pkgs/$(hab pkg list core/cacerts)/ssl/cert.pem"
export SSL_CERT_FILE
# Go >= 1.13 will assume this but we have tools like protoc extensions that
# look for it.
export GO111MODULE=on
Expand Down
21 changes: 11 additions & 10 deletions components/automate-backend-ctl/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ do_before() {
}

pkg_deps=(
core/ruby31
core/libffi
chef/mlsa
core/bash
core/coreutils
core/glibc
core/postgresql-client
core/ruby31/3.1.6/20240912144513
core/libffi/3.4.2/20240105233930
chef/mlsa/1.0.1/20240125084021
core/bash/5.1/20240105214248
core/coreutils/8.32/20240105213308
core/glibc/2.35/20240105171810
core/postgresql-client/9.6.24/20240106122111
)

pkg_build_deps=(
core/make
core/gcc
core/rsync
core/make/4.3/20240105222044
core/gcc/9.5.0/20240105175314
core/rsync/3.2.3/20240107034222
)

pkg_bin_dirs=(bin)
Expand Down Expand Up @@ -101,3 +101,4 @@ EOF
chmod -v 755 "$bin"
}


3 changes: 2 additions & 1 deletion components/automate-backend-deployment/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pkg_deps=(
# core/python ( core/python/3.10.0/20231020105702 core/python/3.10.0/20220817121853 )
#
pkg_build_deps=(
core/gcc
core/gcc/9.5.0/20240105175314
)

# workaround for https://github.com/habitat-sh/habitat/issues/6341
Expand Down Expand Up @@ -130,3 +130,4 @@ do_strip() {




6 changes: 3 additions & 3 deletions components/automate-backend-elasticsidecar/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ pkg_license=("Chef-MLSA")
pkg_version="0.1.0"
pkg_upstream_url="http://github.com/chef/automate/components/automate-backend-elasticsidecar"
pkg_deps=(
core/bash
core/bash/5.1/20240105214248
chef/automate-openjdk
chef/automate-ha-opensearch
)
pkg_build_deps=(
core/make
core/gcc
core/make/4.3/20240105222044
core/gcc/9.5.0/20240105175314
)

pkg_binds=(
Expand Down
1 change: 1 addition & 0 deletions components/automate-backend-haproxy/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,4 @@ do_install() {
return 0
}


22 changes: 11 additions & 11 deletions components/automate-backend-opensearch/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ pkg_upstream_url="https://www.chef.io/automate"
pkg_source="https://artifacts.opensearch.org/releases/bundle/opensearch/1.3.20/opensearch-1.3.20-linux-x64.tar.gz"
pkg_shasum=a786fe52b4d25db85cc49f34df6118f19c434b25935f28bd98c0f874ae77ccc3
pkg_build_deps=(
core/patchelf
core/make
core/gcc
core/patchelf/0.13/20240105212025
core/make/4.3/20240105222044
core/gcc/9.5.0/20240105175314
)

pkg_deps=(
core/coreutils
core/glibc
core/zlib
core/bash # hooks
chef/mlsa
core/curl # health_check
core/coreutils/8.32/20240105213308
core/glibc/2.35/20240105171810
core/zlib/1.3/20240105173710
core/bash/5.1/20240105214248 # hooks
chef/mlsa/1.0.1/20240125084021
core/curl/8.7.1/20240614090648 #healthcheck
chef/automate-openjdk
chef/automate-platform-tools
core/ruby31
chef/automate-platform-tools/0.1.0/20241212061203
core/ruby31/3.1.6/20240912144513
)
pkg_interpreters=(bin/ruby)
pkg_bin_dirs=(os/bin)
Expand Down
8 changes: 5 additions & 3 deletions components/automate-backend-postgresql/habitat/plan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# stable channel


UPSTREAM_PKG_IDENT="core/postgresql13/13.18"
UPSTREAM_PKG_IDENT="core/postgresql13/13.18/20241203070217"
pkg_name="automate-ha-postgresql"
pkg_description="Wrapper package for core/postgresql13"
pkg_origin="chef"
Expand All @@ -13,8 +13,8 @@ pkg_license=("Chef-MLSA")
pkg_upstream_url="https://www.chef.io/automate"

pkg_deps=(
chef/mlsa
core/bash
chef/mlsa/1.0.1/20240125084021
core/bash/5.1/20240105214248
"${UPSTREAM_PKG_IDENT}"
)

Expand Down Expand Up @@ -52,3 +52,5 @@ do_end() {
return 0
}



Loading
Loading