From a5bde07d1f617862dc2b1b2d96cedc2553f45541 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 24 May 2023 10:49:10 -0600 Subject: [PATCH 1/6] testing CI for forks --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6874819733b..12318ee695f 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Consul +Added comments! + [![Docker Pulls](https://img.shields.io/docker/pulls/_/consul.svg)](https://hub.docker.com/_/consul) [![Go Report Card](https://goreportcard.com/badge/github.com/hashicorp/consul)](https://goreportcard.com/report/github.com/hashicorp/consul) From fa0175f50f047a4d5a00383d3de6aa374300b407 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 24 May 2023 11:05:42 -0600 Subject: [PATCH 2/6] do not run on forks --- .github/workflows/reusable-unit-split.yml | 1 + .github/workflows/reusable-unit.yml | 1 + .github/workflows/test-integrations.yml | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml index f8088f4a804..27533e7e8c3 100644 --- a/.github/workflows/reusable-unit-split.yml +++ b/.github/workflows/reusable-unit-split.yml @@ -157,6 +157,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + if: ${{ env.DATADOG_API_KEY}} env: DD_ENV: ci run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" ${{env.TEST_RESULTS}}/gotestsum-report.xml diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml index 5fd47339e12..1c21b8f59b7 100644 --- a/.github/workflows/reusable-unit.yml +++ b/.github/workflows/reusable-unit.yml @@ -125,6 +125,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + if: ${{ env.DATADOG_API_KEY}} env: DD_ENV: ci run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" ${{env.TEST_RESULTS}}/gotestsum-report.xml diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 555d534f1a0..98928fc1dc8 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -121,6 +121,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -200,6 +201,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -338,6 +340,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -442,6 +445,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci From a14aa456f3ded62f1fd14ca178214c2090a05d9d Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 24 May 2023 11:11:58 -0600 Subject: [PATCH 3/6] fix test-integrations --- .github/workflows/test-integrations.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 98928fc1dc8..0539a2dc254 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -121,7 +121,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} + if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -201,7 +201,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} + if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -340,7 +340,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} + if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -445,7 +445,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }} + if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci From a973352ef68cd2945413c136abe12b387c9fbae2 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 24 May 2023 11:18:06 -0600 Subject: [PATCH 4/6] ignore on forks --- .github/workflows/reusable-unit-split.yml | 1 + .github/workflows/reusable-unit.yml | 1 + .github/workflows/test-integrations.yml | 12 ++++++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml index 27533e7e8c3..3b9eb489590 100644 --- a/.github/workflows/reusable-unit-split.yml +++ b/.github/workflows/reusable-unit-split.yml @@ -157,6 +157,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + # do not run on forks if: ${{ env.DATADOG_API_KEY}} env: DD_ENV: ci diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml index 1c21b8f59b7..e7caaae8d6a 100644 --- a/.github/workflows/reusable-unit.yml +++ b/.github/workflows/reusable-unit.yml @@ -125,6 +125,7 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage + # do not run on forks if: ${{ env.DATADOG_API_KEY}} env: DD_ENV: ci diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 0539a2dc254..22ce15f7236 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -121,7 +121,8 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} + # do not run on forks + if: github.event.pull_request.head.repo.full_name == github.repository env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -201,7 +202,8 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} + # do not run on forks + if: github.event.pull_request.head.repo.full_name == github.repository env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -340,7 +342,8 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} + # do not run on forks + if: github.event.pull_request.head.repo.full_name == github.repository env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci @@ -445,7 +448,8 @@ jobs: chmod +x /usr/local/bin/datadog-ci - name: upload coverage - if: ${{ env.DATADOG_API_KEY || (secrets && secrets.DATADOG_API_KEY) }} + # do not run on forks + if: github.event.pull_request.head.repo.full_name == github.repository env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci From 70d2bb41e955060cbe9d8f35a2f2d3a4ce8f0c22 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 24 May 2023 11:31:22 -0600 Subject: [PATCH 5/6] add this to vault-integration-test --- .github/workflows/test-integrations.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index 22ce15f7236..f170e4f506d 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -210,6 +210,8 @@ jobs: run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" "${{ env.TEST_RESULTS_DIR }}/gotestsum-report.xml" - name: upload leader coverage + # do not run on forks + if: github.event.pull_request.head.repo.full_name == github.repository env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci From 3f12ca0b9d8a56e243bdcd214246b69048d2d9a5 Mon Sep 17 00:00:00 2001 From: John Murret Date: Wed, 24 May 2023 12:25:30 -0600 Subject: [PATCH 6/6] add this to vault-integration-test for upload agent coverage --- .github/workflows/test-integrations.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml index f170e4f506d..d98faa44741 100644 --- a/.github/workflows/test-integrations.yml +++ b/.github/workflows/test-integrations.yml @@ -218,6 +218,7 @@ jobs: run: datadog-ci junit upload --service "$GITHUB_REPOSITORY" "${{ env.TEST_RESULTS_DIR }}/gotestsum-report-leader.xml" - name: upload agent coverage + if: github.event.pull_request.head.repo.full_name == github.repository env: DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}" DD_ENV: ci