perf(ci): remove container from go, go-postgres, go-bench jobs #19743
+41
−31
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,16 +31,19 @@ jobs: | |
| env: | ||
| BUILD_TAG: 0.0.0 | ||
| SHORTCOMMIT: "0000000" | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # ratchet:actions/checkout@v6 | ||
|
|
||
| - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # ratchet:actions/setup-go@v6 | ||
| with: | ||
| go-version-file: go.mod | ||
| cache: false | ||
|
|
||
| # setup-go sets GOTOOLCHAIN=local; override so sub-module tools | ||
| # with newer go directives can auto-download. | ||
| - name: Override GOTOOLCHAIN | ||
| run: echo "GOTOOLCHAIN=auto" >> "$GITHUB_ENV" | ||
|
|
||
| - uses: ./.github/actions/job-preamble | ||
| with: | ||
|
|
@@ -115,37 +118,38 @@ jobs: | |
| env: | ||
| BUILD_TAG: 0.0.0 | ||
| SHORTCOMMIT: "0000000" | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # ratchet:actions/checkout@v6 | ||
|
|
||
| - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # ratchet:actions/setup-go@v6 | ||
| with: | ||
| go-version-file: go.mod | ||
| cache: false | ||
|
|
||
| - name: Override GOTOOLCHAIN | ||
| run: echo "GOTOOLCHAIN=auto" >> "$GITHUB_ENV" | ||
|
|
||
| - uses: ./.github/actions/job-preamble | ||
| with: | ||
| gcp-account: ${{ secrets.GCP_SERVICE_ACCOUNT_STACKROX_CI }} | ||
|
|
||
| # trust: allow passwordless local connections (tests don't configure a password) | ||
| # locale=C: tests (e.g. central/splunk) assume byte-order collation for ID comparisons | ||
| - name: Run Postgres | ||
| run: | | ||
| docker run --rm -d --name postgres --network=host \ | ||
| -e POSTGRES_HOST_AUTH_METHOD=trust \ | ||
| -e POSTGRES_INITDB_ARGS="--locale=C" \ | ||
| docker.io/library/postgres:${{ matrix.pg }} | ||
|
|
||
| - name: Cache Go dependencies | ||
| uses: ./.github/actions/cache-go-dependencies | ||
| with: | ||
| key-suffix: ${{ matrix.gotags }} | ||
|
|
||
| - name: Is Postgres ready | ||
| run: pg_isready -h 127.0.0.1 --timeout=60 || { docker logs postgres; exit 1; } | ||
|
|
||
| - name: Go Unit Tests | ||
| run: ${{ matrix.gotags }} make go-postgres-unit-tests | ||
|
|
@@ -177,36 +181,42 @@ jobs: | |
| directory: 'junit-reports' | ||
|
|
||
| go-bench: | ||
| strategy: | ||
| matrix: | ||
| pg: [ '15' ] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # ratchet:actions/checkout@v6 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # ratchet:actions/setup-go@v6 | ||
| with: | ||
| go-version-file: go.mod | ||
| cache: false | ||
|
|
||
| - name: Override GOTOOLCHAIN | ||
| run: echo "GOTOOLCHAIN=auto" >> "$GITHUB_ENV" | ||
|
|
||
| - uses: ./.github/actions/job-preamble | ||
| with: | ||
| gcp-account: ${{ secrets.GCP_SERVICE_ACCOUNT_STACKROX_CI }} | ||
|
|
||
| # trust: allow passwordless local connections (tests don't configure a password) | ||
| # locale=C: tests (e.g. central/splunk) assume byte-order collation for ID comparisons | ||
| - name: Run Postgres | ||
| run: | | ||
| docker run --rm -d --name postgres --network=host \ | ||
| -e POSTGRES_HOST_AUTH_METHOD=trust \ | ||
| -e POSTGRES_INITDB_ARGS="--locale=C" \ | ||
| docker.io/library/postgres:${{ matrix.pg }} | ||
|
Contributor
There was a problem hiding this comment. can we use our own image? Or maybe the db we are using in upstream? stackrox/image/postgres/Dockerfile Line 2 in 2948960 The problem with docker.io is that we need to login first to prevent rate-limits. Al |
||
|
|
||
| - name: Cache Go dependencies | ||
| uses: ./.github/actions/cache-go-dependencies | ||
|
|
||
| - name: Is Postgres ready | ||
| run: pg_isready -h 127.0.0.1 --timeout=60 || { docker logs postgres; exit 1; } | ||
|
|
||
| - name: Go Bench Tests | ||
| run: make go-postgres-bench-tests | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we add matrix here then we need to change required jobs. Let's skip it for now and hardcode 15 as any failures should be caught in unit tests, here we only validate if bench tests are runable.