Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions .github/workflows/release-docker-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,30 @@ on:
- Minor
- Patch
- Snapshot
operator_image_version:
description: 'Image: Operator image version'
type: string
default: latest
core_image_version:
description: 'Image: Core image version'
type: string
default: latest
e2e_image_version:
description: 'Image: E2E image version'
type: string
default: latest
operator_branch:
description: 'Config: Operator branch for config'
type: string
default: main
core_branch:
description: 'Config: Core branch for config'
type: string
default: main
admin_branch:
description: 'Config: Admin branch for config'
type: string
default: main
vulnerability_severity:
description: The severity to fail the workflow if such vulnerability is detected. DO NOT override it unless a Jira ticket is raised. Must be one of ['CRITICAL', 'CRITICAL,HIGH' or 'CRITICAL,HIGH,MEDIUM'] (without space in between).
type: string
Expand All @@ -24,3 +48,20 @@ jobs:
cloud_provider: default
vulnerability_severity: ${{ inputs.vulnerability_severity }}
secrets: inherit

e2e-test:
name: E2E Test
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v2
needs: Image
with:
operator_type: public
operator_image_version: ${{ inputs.operator_image_version }}
core_image_version: ${{ inputs.core_image_version }}
optout_image_version: ${{ needs.image.outputs.image_tag }}
e2e_image_version: ${{ inputs.e2e_image_version }}
core_branch: ${{ inputs.core_branch }}
optout_branch: ${{ github.ref }}
admin_branch: ${{ inputs.admin_branch }}
operator_branch: ${{ inputs.operator_branch }}
secrets: inherit

2 changes: 1 addition & 1 deletion conf/local-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"optout_observe_only": false,
"aws_kms_jwt_signing_public_keys": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvwB41qI5Fe41PDbXqcX5uOvSvfKh8l9QV0O3M+NsB4lKqQEP0t1hfoiXTpOgKz1ArYxHsQ2LeXifX4uwEbYJFlpVM+tyQkTWQjBOw6fsLYK2Xk4X2ylNXUUf7x3SDiOVxyvTh3OZW9kqrDBN9JxSoraNLyfw0hhW0SHpfs699SehgbQ7QWep/gVlKRLIz0XAXaZNw24s79ORcQlrCE6YD0PgQmpI/dK5xMML82n6y3qcTlywlGaU7OGIMdD+CTXA3BcOkgXeqZTXNaX1u6jCTa1lvAczun6avp5VZ4TFiuPo+y4rJ3GU+14cyT5NckEcaTKSvd86UdwK5Id9tl3bQIDAQAB",
"core_public_url": "http://localhost:8088",
"optout_url": "http://localhost:8090",
"optout_url": "http://localhost:8081",
"enforceJwt": false
}
2 changes: 1 addition & 1 deletion conf/local-e2e-docker-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
"aws_kms_jwt_signing_public_keys": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmvwB41qI5Fe41PDbXqcX5uOvSvfKh8l9QV0O3M+NsB4lKqQEP0t1hfoiXTpOgKz1ArYxHsQ2LeXifX4uwEbYJFlpVM+tyQkTWQjBOw6fsLYK2Xk4X2ylNXUUf7x3SDiOVxyvTh3OZW9kqrDBN9JxSoraNLyfw0hhW0SHpfs699SehgbQ7QWep/gVlKRLIz0XAXaZNw24s79ORcQlrCE6YD0PgQmpI/dK5xMML82n6y3qcTlywlGaU7OGIMdD+CTXA3BcOkgXeqZTXNaX1u6jCTa1lvAczun6avp5VZ4TFiuPo+y4rJ3GU+14cyT5NckEcaTKSvd86UdwK5Id9tl3bQIDAQAB",
"enforceJwt": false,
"core_public_url": "http://core:8088",
"optout_url": "http://optout:8090"
"optout_url": "http://optout:8081"
}
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.uid2</groupId>
<artifactId>uid2-optout</artifactId>
<version>2.7.50-30d7874346</version>
<version>2.7.58-SNAPSHOT</version>

<name>uid2-optout</name>
<url>https://github.com/IABTechLab/uid2-optout</url>
Expand Down