From 6d1714ead7f72de9bf7fd518344ed839dfeade84 Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 14:22:16 -0400 Subject: [PATCH 1/4] add aws auth --- .circleci/config.continue.yml.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index 0a707daad1d..e553432d5dc 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -831,10 +831,16 @@ jobs: - run: name: Run + environment: + - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY + - AWS_REGION: us-east-1 + - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` command: | cd system-tests DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh + - run: name: Run APM E2E default tests # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added. From cb1a6026e3be012a09d3a4e686bd13d299a5d6f3 Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 14:54:51 -0400 Subject: [PATCH 2/4] force to run against branch --- .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 e553432d5dc..aa4c5e01d3c 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -269,7 +269,7 @@ commands: command: | git init system-tests cd system-tests - git remote add origin https://github.com/DataDog/system-tests.git + git remote add origin https://github.com/DataDog/system-tests.git && git checkout conti/fix-php-errors git fetch origin << parameters.systemTestsCommit >> git reset --hard FETCH_HEAD From 2b2a56c882811c88c2b7ca340b480d0bc20f7066 Mon Sep 17 00:00:00 2001 From: William Conti Date: Mon, 16 Sep 2024 15:42:58 -0400 Subject: [PATCH 3/4] fix ci again --- .circleci/config.continue.yml.j2 | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index aa4c5e01d3c..325551d8acd 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -269,7 +269,9 @@ commands: command: | git init system-tests cd system-tests - git remote add origin https://github.com/DataDog/system-tests.git && git checkout conti/fix-php-errors + git remote add origin https://github.com/DataDog/system-tests.git + git fetch origin + git checkout conti/fix-php-errors git fetch origin << parameters.systemTestsCommit >> git reset --hard FETCH_HEAD @@ -831,6 +833,12 @@ jobs: - run: name: Run + command: | + cd system-tests + DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh + + - run: + name: Run IDM Integrations tests environment: - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY @@ -838,8 +846,18 @@ jobs: - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` command: | cd system-tests - DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh + DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh INTEGRATIONS + - run: + name: Run IDM Crossed Tracing Libraries propagation tests for messaging + environment: + - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY + - AWS_REGION: us-east-1 + - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` + command: | + cd system-tests + DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES - run: name: Run APM E2E default tests From 3cd013b20d6a7192558e0c9cf7240cba0abfb4d1 Mon Sep 17 00:00:00 2001 From: William Conti Date: Tue, 24 Sep 2024 12:29:52 -0400 Subject: [PATCH 4/4] fix ci yaml --- .circleci/config.continue.yml.j2 | 40 +++++++++++++------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/.circleci/config.continue.yml.j2 b/.circleci/config.continue.yml.j2 index e72692376f9..3b4049c724a 100644 --- a/.circleci/config.continue.yml.j2 +++ b/.circleci/config.continue.yml.j2 @@ -270,8 +270,6 @@ commands: git init system-tests cd system-tests git remote add origin https://github.com/DataDog/system-tests.git - git fetch origin - git checkout conti/fix-php-errors git fetch origin << parameters.systemTestsCommit >> git reset --hard FETCH_HEAD @@ -838,28 +836,6 @@ jobs: cd system-tests DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh - - run: - name: Run IDM Integrations tests - environment: - - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID - - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY - - AWS_REGION: us-east-1 - - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - command: | - cd system-tests - DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh INTEGRATIONS - - - run: - name: Run IDM Crossed Tracing Libraries propagation tests for messaging - environment: - - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID - - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY - - AWS_REGION: us-east-1 - - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` - command: | - cd system-tests - DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES - - run: name: Run APM E2E default tests # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added. @@ -904,11 +880,27 @@ jobs: - run: name: Run APM Integrations tests + environment: + - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY + - AWS_REGION: us-east-1 + - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added. no_output_timeout: 5m command: | cd system-tests DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS + + - run: + name: Run IDM Crossed Tracing Libraries propagation tests for messaging + environment: + - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID + - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY + - AWS_REGION: us-east-1 + - AWS_DEFAULT_REGION: us-east-1 # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION` + command: | + cd system-tests + DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES - store_test_results: path: system-tests/logs_integrations