Skip to content

Commit fde85a2

Browse files
authored
fix: Update GPG and build influx_tools in build (#27397)
1 parent fd1751f commit fde85a2

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

scripts/ci/run_perftest.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,13 @@ install_influxdb() {
2727

2828
install_telegraf() {
2929
# Install Telegraf
30-
curl -fLO https://repos.influxdata.com/influxdata-archive_compat.key
31-
echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c influxdata-archive_compat.key' | sha256sum -c && cat influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
32-
echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
30+
curl -fLO https://repos.influxdata.com/influxdata-archive.key
31+
echo '40557e261cdbdccac91a2dde474cbf101ef672661e64b211b711cc0b904d5dac influxdata-archive.key' | sha256sum -c && cat influxdata-archive.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive.gpg > /dev/null
32+
echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
3333

3434
DEBIAN_FRONTEND=noninteractive apt-get update
3535
DEBIAN_FRONTEND=noninteractive apt-get install -y git jq telegraf awscli
3636

37-
# Install influx_tools
38-
aws --region us-west-2 s3 cp s3://perftest-binaries-influxdb/influx_tools/influx_tools-d3be25b251256755d622792ec91826c5670c6106 ./influx_tools
39-
mv ./influx_tools /usr/bin/influx_tools
40-
chmod 755 /usr/bin/influx_tools
41-
4237
root_branch="$(echo "${INFLUXDB_VERSION}" | rev | cut -d '-' -f1 | rev)"
4338
log_date=$(date +%Y%m%d%H%M%S)
4439

@@ -127,6 +122,17 @@ install_go_bins() {
127122
go install github.com/mikefarah/yq/v4@v4.23.1
128123
}
129124

125+
install_influx_tools() {
126+
local src=/tmp/influxdb-1x
127+
mkdir -p "$src"
128+
git -C "$src" init -q
129+
git -C "$src" remote add origin https://github.com/influxdata/influxdb.git
130+
git -C "$src" fetch --depth 1 -q origin d3be25b251256755d622792ec91826c5670c6106
131+
git -C "$src" checkout -q FETCH_HEAD
132+
(cd "$src" && go build -o /usr/bin/influx_tools ./cmd/influx_tools)
133+
chmod 755 /usr/bin/influx_tools
134+
}
135+
130136
# Helper functions containing common logic
131137
bucket_id() {
132138
bucket_id=$(curl -H "Authorization: Token $TEST_TOKEN" "http://${NGINX_HOST}:8086/api/v2/buckets?org=$TEST_ORG" | jq -r ".buckets[] | select(.name | contains(\"$db_name\")).id")
@@ -308,6 +314,7 @@ install_influxdb
308314
install_telegraf
309315
install_go
310316
install_go_bins
317+
install_influx_tools
311318

312319
# Common variables used across all tests
313320
db_name="benchmark_db"

0 commit comments

Comments
 (0)