Skip to content

Commit

Permalink
Merge branch 'master' into GT-1397-Resultaat-value-is-not-returned-in…
Browse files Browse the repository at this point in the history
…-ZakLa01-message-(the-return-message-to-geefZaakDetails-Request)
  • Loading branch information
MLenterman authored Jan 9, 2025
2 parents d671523 + 24de422 commit a40165d
Show file tree
Hide file tree
Showing 772 changed files with 17,795 additions and 15,021 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/bump-ff-version.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Bump F!F Version

on:
schedule:
- cron: '0 5 * * 1' # At 05:00 on Monday.
workflow_dispatch:
schedule:
- cron: '0 5 * * 1' # At 05:00 on Monday.
inputs:
ff-version-tag:
description: 'F!F version tag requested to update in your project to. It has to be after 8.0.1(including).'
Expand All @@ -12,7 +12,7 @@ on:

jobs:
bump-ff-version:
uses: wearefrank/ci-cd-templates/.github/workflows/ff-version-auto-bumper.yml@5abb5d1df24669c4c4ef75093bb83161c359c66e # 1.0.10
uses: wearefrank/ci-cd-templates/.github/workflows/ff-version-auto-bumper.yml@bdd980ea3327366c72f021c09685abc676b74585 # 1.0.12
secrets:
token: ${{ secrets.WEAREFRANK_BOT_PAT }}
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}
Expand Down
23 changes: 16 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:
version-next: ${{ steps.reference.outputs.next-reference }}
version-next-strict: ${{ steps.reference.outputs.next-reference }}
steps:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
- uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
disable-sudo: true
egress-policy: block
allowed-endpoints: >
github.com:443
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2

- name: Next Reference
id: reference
uses: wearefrank/ci-cd-templates/next-reference@5abb5d1df24669c4c4ef75093bb83161c359c66e #1.0.10
uses: wearefrank/ci-cd-templates/next-reference@bdd980ea3327366c72f021c09685abc676b74585 #1.0.12

ci:
uses: wearefrank/ci-cd-templates/.github/workflows/ci-generic.yml@5abb5d1df24669c4c4ef75093bb83161c359c66e #1.0.10
uses: wearefrank/ci-cd-templates/.github/workflows/ci-generic.yml@bdd980ea3327366c72f021c09685abc676b74585 #1.0.12
needs:
- version-next
secrets:
Expand All @@ -42,18 +42,27 @@ jobs:
upload-sarif-to-security: false
run-frank-till-healthy-enabled: false

run-larva-scenarios:
uses: ./.github/workflows/run-larva-scenarios.yml
needs:
- version-next
- ci
with:
image-id: ${{ needs.ci.outputs.image-id }}

run-soapui-tests:
runs-on: ubuntu-latest
needs:
- version-next
- ci
- run-larva-scenarios
steps:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
- uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2

- name: Download Docker tar
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 #4.1.8
Expand Down Expand Up @@ -108,4 +117,4 @@ jobs:
if: always()
with:
name: reports-soapui-testreports
path: ./*/reports
path: ./*/reports
31 changes: 20 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
version-next-tag: ${{ steps.next-version.outputs.release-tag }}
version-next-type: ${{ steps.next-version.outputs.release-type }}
steps:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
- uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
disable-sudo: true
egress-policy: audit
allowed-endpoints: >
github.com:443
- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2

- name: "Setup Node"
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 #4.0.4
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af #4.1.0
with:
node-version: 20

Expand All @@ -40,7 +40,7 @@ jobs:
GH_TOKEN: ${{ secrets.WEAREFRANK_BOT_PAT }}

ci:
uses: wearefrank/ci-cd-templates/.github/workflows/ci-generic.yml@5abb5d1df24669c4c4ef75093bb83161c359c66e #1.0.10
uses: wearefrank/ci-cd-templates/.github/workflows/ci-generic.yml@bdd980ea3327366c72f021c09685abc676b74585 #1.0.12
needs: analyze-commits
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -52,18 +52,27 @@ jobs:
upload-sarif-to-security: false
run-frank-till-healthy-enabled: false

run-larva-scenarios:
uses: ./.github/workflows/run-larva-scenarios.yml
needs:
- analyze-commits
- ci
with:
image-id: ${{ needs.ci.outputs.image-id }}

run-soapui-tests:
runs-on: ubuntu-latest
needs:
- analyze-commits
- ci
- run-larva-scenarios
steps:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
- uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2

- name: Download Docker tar
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 #4.1.8
Expand Down Expand Up @@ -127,12 +136,12 @@ jobs:
- ci
- run-soapui-tests
steps:
- uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
- uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
with:
egress-policy: audit

- name: Checkout
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #4.2.1
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #4.2.2
with:
token: ${{ secrets.WEAREFRANK_BOT_PAT }}

Expand All @@ -149,7 +158,7 @@ jobs:
merge-multiple: true

- name: Setup Node
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 #4.0.4
uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af #4.1.0
with:
node-version: 20

Expand All @@ -163,7 +172,7 @@ jobs:
GH_TOKEN: ${{ secrets.WEAREFRANK_BOT_PAT }}

docker-release:
uses: wearefrank/ci-cd-templates/.github/workflows/docker-release-generic.yml@5abb5d1df24669c4c4ef75093bb83161c359c66e #1.0.10
uses: wearefrank/ci-cd-templates/.github/workflows/docker-release-generic.yml@bdd980ea3327366c72f021c09685abc676b74585 #1.0.12
needs:
- analyze-commits
- release
Expand Down Expand Up @@ -193,4 +202,4 @@ jobs:
- release
# Set to true to enable Docusaurus publishing to GitHub Pages
if: true
uses: wearefrank/ci-cd-templates/.github/workflows/docusaurus-release.yml@5abb5d1df24669c4c4ef75093bb83161c359c66e #1.0.10
uses: wearefrank/ci-cd-templates/.github/workflows/docusaurus-release.yml@bdd980ea3327366c72f021c09685abc676b74585 #1.0.12
103 changes: 103 additions & 0 deletions .github/workflows/run-larva-scenarios.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
name: Run Larva Scenarios

on:
workflow_call:
inputs:
image-id:
type: string
description: >
Docker image id of the loaded image to use.
Note that the Docker image needs to be available to the Docker runtime already.
required: false
docker-image-tag:
type: string
description: >
Docker image tag of the loaded image to use. For example: 'wearefrank/zaakbrug:1.2.0'.
Note that the Docker image needs to be available to the Docker runtime already.
required: false

jobs:
run-larva-scenarios:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #4.1.7

- name: Download Docker tar
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 #4.1.8
with:
name: build-docker-image

- name: Load Docker tar
shell: bash
run: |
docker load --input image.tar
docker image ls -a
- name: Start Application
id: docker-run
shell: bash
run: |
echo "container-id=$(docker run -d -p 8080:8080 -e dtap.stage=LOC ${{ inputs.image-id || inputs.docker-image-tag }})" >> "$GITHUB_OUTPUT"
timeout-minutes: 2

- name: Wait for Application to be Healthy
shell: bash
run: |
start_time=$(date +%s)
timeout=300
while true; do
if [ "$(docker inspect --format='{{json .State.Health.Status}}' ${{steps.docker-run.outputs.container-id}})" = '"healthy"' ]; then
echo "Application is healthy."
break
fi
current_time=$(date +%s)
elapsed_time=$((current_time - start_time))
if [ $elapsed_time -ge $timeout ]; then
echo "Application did not become healthy within $timeout seconds. Failing the job."
exit 1
fi
echo "Waiting for application to be healthy..."
sleep 5
done
timeout-minutes: 6

- name: Trigger Larva Tool
shell: bash
run: |
curl -X POST 'http://localhost:8080/iaf/larva/index.jsp' \
--header 'Content-Type: application/x-www-form-urlencoded' \
--data-urlencode 'scenariosrootdirectory=/opt/frank/testtool' \
--data-urlencode 'waitbeforecleanup=100' \
--data-urlencode 'loglevel=WRONG_PIPELINE_MESSAGES_PREPARED_FOR_DIFF' \
--data-urlencode 'execute=/opt/frank/testtool' \
--data-urlencode 'submit=start' > results.html
- name: Check if all scenarios passed
shell: bash
run: |
if ! grep -q 'All scenarios passed' results.html; then
echo "Not all scenarios passed. Failing the job."
exit 1
fi
- name: Generate Result in Markdown
uses: docker://pandoc/core:3.5
if: ${{ always() }}
with:
args: -s results.html --from html -o results.md --to gfm --standalone

- name: Add Larva Result To GitHub Actions Summary
shell: bash
if: ${{ always() }}
run: |
cat results.md >> $GITHUB_STEP_SUMMARY
- name: Cleanup
shell: bash
if: ${{ always() }}
run: |
docker stop ${{ steps.docker-run.outputs.container-id }}
docker rm --volumes ${{ steps.docker-run.outputs.container-id }}
2 changes: 1 addition & 1 deletion .github/workflows/update-helm-chart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Dispatch an action and get the run ID
uses: Codex-/[email protected].2
uses: Codex-/[email protected].3
id: return_dispatch
with:
token: ${{ secrets.token }}
Expand Down
Loading

0 comments on commit a40165d

Please sign in to comment.