diff --git a/.github/workflows/collector-builder.yml b/.github/workflows/collector-builder.yml index ae1aa487c8..d2cac9c9bd 100644 --- a/.github/workflows/collector-builder.yml +++ b/.github/workflows/collector-builder.yml @@ -51,7 +51,8 @@ jobs: github.ref_type == 'tag' || startsWith(github.ref_name, 'release-') )) || contains(github.event.pull_request.labels.*.name, 'build-builder-image') || - github.event_name == 'schedule' + github.event_name == 'schedule' || + (github.event_name == 'pull_request' && startsWith(github.base_ref, 'release-')) run: | COLLECTOR_BUILDER_TAG="${DEFAULT_BUILDER_TAG}" if [[ "${{ github.event_name }}" == 'pull_request' || \ diff --git a/.github/workflows/integration-test-containers.yml b/.github/workflows/integration-test-containers.yml index 9d6a1590fc..a20f404db0 100644 --- a/.github/workflows/integration-test-containers.yml +++ b/.github/workflows/integration-test-containers.yml @@ -56,11 +56,13 @@ jobs: needs: - should-build-test-image if: | - ( + (( github.event_name != 'pull_request' || needs.should-build-test-image.outputs.build-image == 'true' || contains(github.event.pull_request.labels.*.name, 'rebuild-test-container') - ) && + ) || ( + github.event_name == 'pull_request' && startsWith(github.base_ref, 'release-') + )) && !contains(github.event.pull_request.labels.*.name, 'skip-integration-tests') outputs: