Skip to content

Commit 66a676d

Browse files
committed
[DEVOPS-3466] Packaging: Add perf_advisor to yba_installer
Summary: Add perf_advisor to yba_installer Test Plan: jenkins Reviewers: devops, dshubin Reviewed By: dshubin Subscribers: devops Differential Revision: https://phorge.dev.yugabyte.com/D46789
1 parent 836d615 commit 66a676d

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

managed/yba-installer/Makefile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ CONFIG_INPUT_FILE_NAME:=$(CURDIR)/yba-ctl.yml.reference
3131
CONFIG_EMBEDED_NAME:=$(CURDIR)/pkg/config/yba-ctl.yml
3232
VERSION_METADATA_JSON:=$(CURDIR)/version_metadata.json
3333

34-
# get the perf advisor version from the tarball if it exists
35-
PERF_ADVISOR_TARBALL ?= $(shell ls $(CURDIR)/perf_advisor-*.tar.gz 2>/dev/null | head -1)
36-
PERF_ADVISOR_VERSION ?= $(if $(PERF_ADVISOR_TARBALL),$(shell basename $(PERF_ADVISOR_TARBALL) | sed -E 's/perf_advisor-([0-9a-zA-Z\.\-]+)\.tar\.gz/\1/'),)
34+
# get the perf advisor version to bundle
35+
PERF_ADVISOR_VERSION ?= 1.0.0-b5
36+
PA_BINARY_NAME ?= perf_advisor-$(PERF_ADVISOR_VERSION).tar.gz
37+
PA_BINARY_URL := https://releases.yugabyte.com/perf-advisor/$(PA_BINARY_NAME)
3738

3839
#pre-reqs
3940
PREREQS_DIR := ${TOP_BUILDDIR}/prereqs
@@ -56,13 +57,17 @@ YBDB_BINARY_URL ?= https://s3.us-west-2.amazonaws.com/downloads.yugabyte.com/rel
5657

5758

5859

59-
all: prereqs test yba-ctl package
60+
all: test package
6061

61-
prereqs: postgres jdk
62+
prereqs: postgres jdk perf_advisor
6263

6364
echo:
6465
@echo $(CURDIR)
6566

67+
perf_advisor: ${PREREQS_DIR}/${PA_BINARY_NAME}
68+
${PREREQS_DIR}/${PA_BINARY_NAME}:
69+
curl -Lo $@ ${PG_BINARY_URL}
70+
@echo downloaded $@
6671

6772
postgres: ${PREREQS_DIR}/${PG_BINARY_NAME}
6873
${PREREQS_DIR}/${PG_BINARY_NAME}:
@@ -92,7 +97,7 @@ ${BIN_DIR}/${BIN_NAME}:
9297

9398
package: ${PACKAGE_NAME}
9499
${PACKAGE_NAME}: prereqs yba-ctl
95-
mkdir $(PACKAGE_DIR)
100+
mkdir -p $(PACKAGE_DIR)
96101
cp -RL ${BIN_DIR}/${BIN_NAME} ${PREREQS_DIR}/* ${CONFIG_FILE_FOLDER} ${CONFIG_INPUT_FILE_NAME} ${VERSION_METADATA_JSON} ${VERSION_TXT} ${PACKAGE_DIR}
97102
tar -czvf ${PACKAGE_NAME} ${PACKAGE_DIR} && rm -R ${PACKAGE_DIR}
98103

0 commit comments

Comments
 (0)