From 90916f8ad4e55029bfe348fda2fdb451e4f95704 Mon Sep 17 00:00:00 2001 From: Santiago Mola Date: Fri, 18 Aug 2023 11:37:44 +0200 Subject: [PATCH 1/2] fix update_pinned_system_tests.sh --- .circleci/update_pinned_system_tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/update_pinned_system_tests.sh b/.circleci/update_pinned_system_tests.sh index 9263b234256..cb28661574c 100755 --- a/.circleci/update_pinned_system_tests.sh +++ b/.circleci/update_pinned_system_tests.sh @@ -8,7 +8,7 @@ if [[ -n $(git diff --stat) ]]; then exit 1 fi -current_commit="$(grep ^default_system_tests_commit: config.yml | sed -e 's~^.* ~~g')" +current_commit="$(grep ^default_system_tests_commit: config.continue.yml.j2 | sed -e 's~^.* ~~g')" latest_commit="$(git ls-remote git@github.com:DataDog/system-tests.git refs/heads/main | cut -f 1)" echo "Current commit: $current_commit" @@ -19,6 +19,6 @@ if [[ "$current_commit" = "$latest_commit" ]]; then fi echo "Updating config.yml" -sed -i -e "s~${current_commit?}~${latest_commit?}~g" config.yml -git diff config.yml | cat -git commit -m "Update system-tests to $latest_commit" config.yml +sed -i -e "s~${current_commit?}~${latest_commit?}~g" config.continue.yml.j2 +git diff config.continue.yml.j2 | cat +git commit -m "Update system-tests to $latest_commit" config.continue.yml.j2 From dcce6e941f7edf9a548d61e7e386af3fc4b480ef Mon Sep 17 00:00:00 2001 From: Santiago Mola Date: Fri, 18 Aug 2023 11:37:56 +0200 Subject: [PATCH 2/2] Update system-tests to 9659a5e409cf8bacabd739b6af07c5f03c9bcbd6 --- .circleci/config.continue.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index b913dde32bc..748e00998b7 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -29,7 +29,7 @@ instrumentation_modules: &instrumentation_modules "dd-java-agent/instrumentation debugger_modules: &debugger_modules "dd-java-agent/agent-debugger|dd-java-agent/agent-bootstrap|dd-java-agent/agent-builder|internal-api|communication|dd-trace-core" profiling_modules: &profiling_modules "dd-java-agent/agent-profiling" -default_system_tests_commit: &default_system_tests_commit 68da674b83d7a1a1730387a3b27a1d4328392f3c +default_system_tests_commit: &default_system_tests_commit 9659a5e409cf8bacabd739b6af07c5f03c9bcbd6 parameters: gradle_flags: