From 6ac39897f50db94499328ae80e26cd22d25de807 Mon Sep 17 00:00:00 2001 From: Pierre Tessier Date: Wed, 1 May 2024 14:40:14 -0700 Subject: [PATCH] [chore] specify default value for tracetest image version (#1551) * specify default value for tracetest image version * update tracetest to v1.0.0 --- .env | 3 +-- CHANGELOG.md | 2 ++ docker-compose.yml | 2 -- test/tracetesting/Dockerfile | 5 +++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env b/.env index d2921c2d32..3028d8985b 100644 --- a/.env +++ b/.env @@ -14,8 +14,7 @@ OPENSEARCH_IMAGE=opensearchproject/opensearch:2.12.0 POSTGRES_IMAGE=postgres:16.2 PROMETHEUS_IMAGE=quay.io/prometheus/prometheus:v2.51.1 REDIS_IMAGE=redis:7.2-alpine -TRACETEST_IMAGE_VERSION=v0.16.0 -TRACETEST_IMAGE=kubeshop/tracetest:${TRACETEST_IMAGE_VERSION} +TRACETEST_IMAGE=kubeshop/tracetest:v1.0.0 # Demo Platform ENV_PLATFORM=local diff --git a/CHANGELOG.md b/CHANGELOG.md index e14db39b4d..5eeda2a8a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ the release. ([#1528](https://github.com/open-telemetry/opentelemetry-demo/pull/1528)) * [otelcollector] Add `redisreceiver` ([#1537](https://github.com/open-telemetry/opentelemetry-demo/pull/1537)) +* [traceBasedTests] update to v1.0.0 + ([#1551](https://github.com/open-telemetry/opentelemetry-demo/pull/1551)) ## 1.9.0 diff --git a/docker-compose.yml b/docker-compose.yml index 30309794bf..27b2760a4d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -778,8 +778,6 @@ services: build: context: ./ dockerfile: ./test/tracetesting/Dockerfile - args: - - TRACETEST_IMAGE_VERSION environment: - AD_SERVICE_ADDR - CART_SERVICE_ADDR diff --git a/test/tracetesting/Dockerfile b/test/tracetesting/Dockerfile index c5c8d4d18d..a452db3882 100644 --- a/test/tracetesting/Dockerfile +++ b/test/tracetesting/Dockerfile @@ -6,10 +6,11 @@ FROM alpine WORKDIR /app -ARG TRACETEST_IMAGE_VERSION +# The build-images workflow action does not set a build-arg so we need to specify a default value here +ARG TRACETEST_IMAGE_VERSION=v1.0.0 RUN apk --update add bash jq curl -RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- ${TRACETEST_IMAGE_VERSION} +RUN curl -L https://raw.githubusercontent.com/kubeshop/tracetest/main/install-cli.sh | bash -s -- $TRACETEST_IMAGE_VERSION WORKDIR /app/test/tracetesting