Skip to content

Commit

Permalink
Fixed GitHub pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
gmsdelmundo committed Dec 7, 2023
1 parent bffeed2 commit 7129f51
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/publish-e2e-test-suites-docker-image.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Publish E2E Test Suites
run-name: ${{ format('Publish {0} E2E Test Suites {1}', inputs.release_type) }}
run-name: ${{ format('Publish E2E Test Suites{0} {1} Release', ':', inputs.release_type) }}
on:
workflow_dispatch:
inputs:
Expand All @@ -23,5 +23,7 @@ jobs:
release_type: ${{ inputs.release_type }}
version_number_input: ${{ inputs.version_number_input }}
cloud_provider: 'default'
java_version: '17'
force_release: 'yes'
skip_tests: true
secrets: inherit
6 changes: 6 additions & 0 deletions .github/workflows/validate-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@ jobs:
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'default'
java_version: '17'
skip_tests: true
secrets: inherit
build-publish-docker-aws:
uses: IABTechLab/uid2-shared-actions/.github/workflows/[email protected]
with:
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'aws'
java_version: '17'
skip_tests: true
secrets: inherit
needs: [build-publish-docker-default]
build-publish-docker-gcp:
Expand All @@ -36,5 +40,7 @@ jobs:
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
fail_on_error: ${{ inputs.fail_on_error || true }}
cloud_provider: 'gcp'
java_version: '17'
skip_tests: true
secrets: inherit
needs: [build-publish-docker-aws]
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,10 @@ ENV UID2_E2E_PIPELINE_OPERATOR_URL ""
ENV UID2_E2E_PIPELINE_OPERATOR_TYPE ""
ENV UID2_E2E_PIPELINE_OPERATOR_CLOUD_PROVIDER ""

# TODO: UID2-988 - Delete LOCAL_PUBLIC case after optout is integrated into local dev env
CMD \
if [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "LOCAL_PUBLIC" ] && [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PUBLIC" ] && [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PRIVATE" ] ; \
if [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PUBLIC" ] && [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" != "PRIVATE" ] ; \
then \
echo "ERROR: Incorrect operator type: $UID2_E2E_PIPELINE_OPERATOR_TYPE" ; \
elif [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" = "LOCAL_PUBLIC" ] ; \
then \
export UID2_E2E_PIPELINE_OPERATOR_TYPE="PUBLIC" ; \
mvn test -Dtest="E2ELocalPublicOperatorTestSuite" ; \
elif [ "$UID2_E2E_PIPELINE_OPERATOR_TYPE" = "PUBLIC" ] ; \
then \
mvn test -Dtest="E2EPublicOperatorTestSuite" ; \
Expand Down
1 change: 1 addition & 0 deletions version.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.32", "publicReleaseRefSpec": [ "^refs/heads/master$", "^refs/heads/v\\d+(?:\\.\\d+)?$" ], "cloudBuild": { "setVersionVariables": true, "buildNumber": { "enabled": true, "includeCommitId": { "when": "always" } } } }

0 comments on commit 7129f51

Please sign in to comment.