Skip to content

Commit 1d2389a

Browse files
committed
chore: Merge branch 'main' into run-integration-test-otel
2 parents b116a91 + 300c8f6 commit 1d2389a

5 files changed

Lines changed: 5 additions & 18 deletions

File tree

publish-image-index-manifest/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ This action creates an image index manifest, publishes it, and signs it. It does
2929
### Outputs
3030

3131
- `image-index-uri`: The final image index URI, eg. `oci.stackable.tech/spd/kafka:3.4.1-stackable0.0.0-dev`.
32-
- `image-index-manifest-digest`: The digest (`sha256:...`) of the pushed image index manifest, used as input for SLSA provenance generation.
32+
- `image-index-manifest-digest`: The digest (`sha256:...`) of the pushed image index manifest.
3333

3434
[publish-image-index-manifest]: ./action.yaml

publish-image-index-manifest/action.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ outputs:
4242
description: The Image Index URI.
4343
value: ${{ steps.create-index.outputs.IMAGE_INDEX_URI }}
4444
image-index-manifest-digest:
45-
description: |
46-
The digest (sha256:...) of the pushed image index manifest. Used as input
47-
for SLSA provenance generation.
45+
description: The digest (sha256:...) of the pushed image index manifest.
4846
value: ${{ steps.create-index.outputs.IMAGE_INDEX_MANIFEST_DIGEST }}
4947
runs:
5048
using: composite
@@ -99,8 +97,8 @@ runs:
9997
docker manifest create "$IMAGE_INDEX_URI" ${AMEND_OPTIONS[@]}
10098
docker manifest push "$IMAGE_INDEX_URI"
10199
102-
# Get the image index manifest digest and expose it as an output, so it
103-
# can be fed into SLSA provenance generation.
100+
# Get the image index manifest digest and expose it as an output, so
101+
# callers can reference the pushed index by digest.
104102
DIGEST=$("$GITHUB_ACTION_PATH/../.scripts/actions/get_manifest_digest.sh" "$IMAGE_INDEX_URI")
105103
echo "IMAGE_INDEX_MANIFEST_DIGEST=$DIGEST" | tee -a "$GITHUB_OUTPUT"
106104

send-slack-notification/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
build-result: ${{ needs.job_1.result }}
2929
publish-helm-chart-result: ${{ needs.job_3.result }}
3030
publish-manifests-result: ${{ needs.job_2.result }}
31-
generate-provenance-result: ${{ needs.job_4.result }}
3231
slack-token: ${{ secrets.MY_SECRET }}
3332
```
3433
@@ -66,7 +65,6 @@ jobs:
6665
- `build-result` (optional, e.g. `success`)
6766
- `publish-manifests-result` (optional, e.g. `failure`)
6867
- `publish-helm-chart-result` (optional, e.g. `failure`)
69-
- `generate-provenance-result` (optional, e.g. `failure`)
7068
- `message-subject` (optional, defaults to `github.workflow` for `container-image-build` and
7169
`github.repository` for `integration-test`)
7270

send-slack-notification/action.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ inputs:
1515
publish-helm-chart-result:
1616
description: The result of the publish helm chart job (if any)
1717
default: "N/A"
18-
generate-provenance-result:
19-
description: The result of the generate provenance job (if any)
20-
default: "N/A"
2118
test-result:
2219
description: The result of an integration test
2320
test-health:
@@ -40,7 +37,6 @@ runs:
4037

4138
PUBLISH_MANIFESTS_RESULT: ${{ inputs.publish-manifests-result }}
4239
PUBLISH_HELM_CHART_RESULT: ${{ inputs.publish-helm-chart-result }}
43-
GENERATE_PROVENANCE_RESULT: ${{ inputs.generate-provenance-result }}
4440
BUILD_RESULT: ${{ inputs.build-result }}
4541

4642
FAILED_TESTS: ${{ inputs.failed-tests }}
@@ -61,7 +57,6 @@ runs:
6157
6258
echo "PUBLISH_MANIFESTS_RESULT=$PUBLISH_MANIFESTS_RESULT" | tee -a "$GITHUB_OUTPUT"
6359
echo "PUBLISH_HELM_CHART_RESULT=$PUBLISH_HELM_CHART_RESULT" | tee -a "$GITHUB_OUTPUT"
64-
echo "GENERATE_PROVENANCE_RESULT=$GENERATE_PROVENANCE_RESULT" | tee -a "$GITHUB_OUTPUT"
6560
echo "BUILD_RESULT=$BUILD_RESULT" | tee -a "$GITHUB_OUTPUT"
6661
elif [ "$NOTIFICATION_TYPE" == "integration-test" ]; then
6762
[ -z "${TEST_RESULT:-}" ] && echo "The test-result input must be provided" && exit 1
@@ -98,7 +93,6 @@ runs:
9893
env:
9994
PUBLISH_MANIFESTS_RESULT: ${{ steps.valid_inputs.outputs.PUBLISH_MANIFESTS_RESULT }}
10095
PUBLISH_HELM_CHART_RESULT: ${{ steps.valid_inputs.outputs.PUBLISH_HELM_CHART_RESULT }}
101-
GENERATE_PROVENANCE_RESULT: ${{ steps.valid_inputs.outputs.GENERATE_PROVENANCE_RESULT }}
10296
BUILD_RESULT: ${{ steps.valid_inputs.outputs.BUILD_RESULT }}
10397
FAILED_TESTS: ${{ steps.valid_inputs.outputs.FAILED_TESTS }}
10498
TEST_HEALTH: ${{ steps.valid_inputs.outputs.TEST_HEALTH }}
@@ -126,7 +120,7 @@ runs:
126120
fi
127121
128122
# TODO (@Techassi): Also add success template
129-
if [ "$PUBLISH_MANIFESTS_RESULT" = "failure" ] || [ "$PUBLISH_HELM_CHART_RESULT" = "failure" ] || [ "$GENERATE_PROVENANCE_RESULT" = "failure" ] || [ "$BUILD_RESULT" = "failure" ]; then
123+
if [ "$PUBLISH_MANIFESTS_RESULT" = "failure" ] || [ "$PUBLISH_HELM_CHART_RESULT" = "failure" ] || [ "$BUILD_RESULT" = "failure" ]; then
130124
export MESSAGE_VERB=failed
131125
export MESSAGE_COLOR=aa0000
132126
else

send-slack-notification/templates/container-image-build/failure.tpl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ attachments:
1414
- title: Build/Publish Helm Chart
1515
short: true
1616
value: "${PUBLISH_HELM_CHART_RESULT}"
17-
- title: Generate Provenance
18-
short: true
19-
value: "${GENERATE_PROVENANCE_RESULT}"
2017
actions:
2118
- type: button
2219
text: Go to workflow run

0 commit comments

Comments
 (0)