From fa60e88cb33d9880fe10f3994be358503f54dac1 Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 15:54:31 +0800 Subject: [PATCH 1/8] Using Core Test instead of local core for e2e tests --- conf/docker-config.json | 20 +++++++++++--------- conf/integ-config.json | 20 ++++++++++---------- conf/local-config.json | 20 +++++++++++--------- conf/local-e2e-private-config.json | 22 +++++++++++----------- conf/local-e2e-public-config.json | 22 +++++++++++----------- 5 files changed, 54 insertions(+), 50 deletions(-) diff --git a/conf/docker-config.json b/conf/docker-config.json index 25f38e6ae..b949dbcce 100644 --- a/conf/docker-config.json +++ b/conf/docker-config.json @@ -1,7 +1,7 @@ { "service_verbose": true, "service_instances": 1, - "storage_mock": true, + "storage_mock": false, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, "refresh_token_v3": false, @@ -23,14 +23,16 @@ "cloud_download_threads": 8, "cloud_upload_threads": 2, "cloud_refresh_interval": 60, - "sites_metadata_path": "/com.uid2.core/test/sites/metadata.json", - "clients_metadata_path": "/com.uid2.core/test/clients/metadata.json", - "keysets_metadata_path": "/com.uid2.core/test/keysets/metadata.json", - "keyset_keys_metadata_path": "/com.uid2.core/test/keyset_keys/metadata.json", - "client_side_keypairs_metadata_path": "/com.uid2.core/test/client_side_keypairs/metadata.json", - "salts_metadata_path": "/com.uid2.core/test/salts/metadata.json", - "services_metadata_path": "/com.uid2.core/test/services/metadata.json", - "service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json", + "sites_metadata_path": "https://core.test.uidapi.com/sites/refresh", + "clients_metadata_path": "https://core.test.uidapi.com/clients/refresh", + "keysets_metadata_path": "https://core.test.uidapi.com/key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.test.uidapi.com/key/keyset-keys/refresh", + "client_side_keypairs_metadata_path": "https://core.test.uidapi.com/client_side_keypairs/refresh", + "salts_metadata_path": "https://core.test.uidapi.com/salt/refresh", + "services_metadata_path": "https://core.test.uidapi.com/services/refresh", + "service_links_metadata_path": "https://core.test.uidapi.com/service_links/refresh", + "core_attest_url": "https://core.test.uidapi.com/attest", + "core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=", "identity_token_expires_after_seconds": 3600, "optout_metadata_path": null, "optout_inmem_cache": false, diff --git a/conf/integ-config.json b/conf/integ-config.json index f1cf90742..82e104057 100644 --- a/conf/integ-config.json +++ b/conf/integ-config.json @@ -1,16 +1,16 @@ { "service_instances": 1, - "sites_metadata_path": "http://localhost:8088/sites/refresh", - "clients_metadata_path": "http://localhost:8088/clients/refresh", - "keysets_metadata_path": "http://localhost:8088/key/keyset/refresh", - "keyset_keys_metadata_path": "http://localhost:8088/key/keyset-keys/refresh", - "client_side_keypairs_metadata_path": "http://localhost:8088/client_side_keypairs/refresh", - "salts_metadata_path": "http://localhost:8088/salt/refresh", - "services_metadata_path": "http://localhost:8088/services/refresh", - "service_links_metadata_path": "http://localhost:8088/service_links/refresh", + "sites_metadata_path": "https://core.test.uidapi.com//sites/refresh", + "clients_metadata_path": "https://core.test.uidapi.com//clients/refresh", + "keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh", + "client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh", + "salts_metadata_path": "https://core.test.uidapi.com//salt/refresh", + "services_metadata_path": "https://core.test.uidapi.com//services/refresh", + "service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh", + "core_attest_url": "https://core.test.uidapi.com//attest", "optout_metadata_path": "http://localhost:8081/optout/refresh", - "core_attest_url": "http://localhost:8088/attest", - "core_api_token": "trusted-partner-key", + "core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=", "optout_api_token": "test-operator-key", "optout_api_uri": "http://localhost:8081/optout/replicate", "salts_expired_shutdown_hours": 12, diff --git a/conf/local-config.json b/conf/local-config.json index 6a357dba1..935864fb6 100644 --- a/conf/local-config.json +++ b/conf/local-config.json @@ -1,14 +1,16 @@ { "service_instances": 4, - "storage_mock": true, - "sites_metadata_path": "/com.uid2.core/test/sites/metadata.json", - "clients_metadata_path": "/com.uid2.core/test/clients/metadata.json", - "keysets_metadata_path": "/com.uid2.core/test/keysets/metadata.json", - "keyset_keys_metadata_path": "/com.uid2.core/test/keyset_keys/metadata.json", - "client_side_keypairs_metadata_path": "/com.uid2.core/test/client_side_keypairs/metadata.json", - "salts_metadata_path": "/com.uid2.core/test/salts/metadata.json", - "services_metadata_path": "/com.uid2.core/test/services/metadata.json", - "service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json", + "storage_mock": false, + "sites_metadata_path": "https://core.test.uidapi.com//sites/refresh", + "clients_metadata_path": "https://core.test.uidapi.com//clients/refresh", + "keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh", + "client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh", + "salts_metadata_path": "https://core.test.uidapi.com//salt/refresh", + "services_metadata_path": "https://core.test.uidapi.com//services/refresh", + "service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh", + "core_attest_url": "https://core.test.uidapi.com//attest", + "core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=", "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-private-config.json b/conf/local-e2e-private-config.json index 4ab52330f..a12603aa5 100644 --- a/conf/local-e2e-private-config.json +++ b/conf/local-e2e-private-config.json @@ -1,18 +1,18 @@ { "service_instances": 1, "storage_mock": true, - "core_attest_url": "http://localhost:8088/attest", + "core_attest_url": "https://core.test.uidapi.com//attest", "core_api_token": "OPLCLAjLRWcVlCDl9+BbwR38gzxYdiWFa751ynWLuI7JU4iA=", - "sites_metadata_path": "http://localhost:8088/sites/refresh", - "clients_metadata_path": "http://localhost:8088/clients/refresh", - "client_side_keypairs_metadata_path": "http://localhost:8088/client_side_keypairs/refresh", - "keys_metadata_path": "http://localhost:8088/key/refresh", - "keys_acl_metadata_path": "http://localhost:8088/key/acl/refresh", - "keysets_metadata_path": "http://localhost:8088/key/keyset/refresh", - "keyset_keys_metadata_path": "http://localhost:8088/key/keyset-keys/refresh", - "salts_metadata_path": "http://localhost:8088/salt/refresh", - "services_metadata_path": "http://localhost:8088/services/refresh", - "service_links_metadata_path": "http://localhost:8088/service_links/refresh", + "sites_metadata_path": "https://core.test.uidapi.com//sites/refresh", + "clients_metadata_path": "https://core.test.uidapi.com//clients/refresh", + "client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh", + "keys_metadata_path": "https://core.test.uidapi.com//key/refresh", + "keys_acl_metadata_path": "https://core.test.uidapi.com//key/acl/refresh", + "keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh", + "salts_metadata_path": "https://core.test.uidapi.com//salt/refresh", + "services_metadata_path": "https://core.test.uidapi.com//services/refresh", + "service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh", "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, diff --git a/conf/local-e2e-public-config.json b/conf/local-e2e-public-config.json index bfdc8e394..4b1736837 100644 --- a/conf/local-e2e-public-config.json +++ b/conf/local-e2e-public-config.json @@ -1,18 +1,18 @@ { "service_instances": 1, "storage_mock": true, - "core_attest_url": "http://localhost:8088/attest", + "core_attest_url": "https://core.test.uidapi.com//attest", "core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=", - "sites_metadata_path": "http://localhost:8088/sites/refresh", - "clients_metadata_path": "http://localhost:8088/clients/refresh", - "client_side_keypairs_metadata_path": "http://localhost:8088/client_side_keypairs/refresh", - "keys_metadata_path": "http://localhost:8088/key/refresh", - "keys_acl_metadata_path": "http://localhost:8088/key/acl/refresh", - "keysets_metadata_path": "http://localhost:8088/key/keyset/refresh", - "keyset_keys_metadata_path": "http://localhost:8088/key/keyset-keys/refresh", - "salts_metadata_path": "http://localhost:8088/salt/refresh", - "services_metadata_path": "http://localhost:8088/services/refresh", - "service_links_metadata_path": "http://localhost:8088/service_links/refresh", + "sites_metadata_path": "https://core.test.uidapi.com//sites/refresh", + "clients_metadata_path": "https://core.test.uidapi.com//clients/refresh", + "client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh", + "keys_metadata_path": "https://core.test.uidapi.com//key/refresh", + "keys_acl_metadata_path": "https://core.test.uidapi.com//key/acl/refresh", + "keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh", + "keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh", + "salts_metadata_path": "https://core.test.uidapi.com//salt/refresh", + "services_metadata_path": "https://core.test.uidapi.com//services/refresh", + "service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh", "identity_token_expires_after_seconds": 3600, "refresh_token_expires_after_seconds": 86400, "refresh_identity_token_after_seconds": 900, From 23071f0eb57b9279eae32716fa1955cd5500a0e9 Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:20:33 +0800 Subject: [PATCH 2/8] Using latest shared actions --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index e57756c1b..aeb27469b 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,7 +106,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@main with: operator_type: ${{ inputs.operator_type }} operator_image_version: ${{ inputs.operator_image_version }} From 98dbdd9b7fa34c6381d3ebdd6f3ae659c451bfed Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:26:53 +0800 Subject: [PATCH 3/8] does this even work --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index aeb27469b..247d850f7 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,7 +106,7 @@ on: jobs: e2e-test: name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@main + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@sdfdsfdsfdsf with: operator_type: ${{ inputs.operator_type }} operator_image_version: ${{ inputs.operator_image_version }} From c323d3eabff0bdaeb0107c8101d68a974b77c258 Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:35:34 +0800 Subject: [PATCH 4/8] testing stuff --- .../workflows/run-e2e-tests-on-operator.yaml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 247d850f7..29ab2a81f 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -102,29 +102,29 @@ on: type: string default: '{ "pcr0": "xxxxx" }' - -jobs: - e2e-test: - name: E2E Test - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@sdfdsfdsfdsf - with: - operator_type: ${{ inputs.operator_type }} - operator_image_version: ${{ inputs.operator_image_version }} - core_image_version: ${{ inputs.core_image_version }} - optout_image_version: ${{ inputs.optout_image_version }} - e2e_image_version: ${{ inputs.e2e_image_version }} - operator_branch: ${{ github.ref }} - branch_core: ${{ fromJson(inputs.branch).core }} - branch_optout: ${{ fromJson(inputs.branch).optout }} - branch_admin: ${{ fromJson(inputs.branch).admin }} - uid2_e2e_identity_scope: ${{ inputs.identity_scope }} - gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} - gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} - gcp_project: ${{ vars.GCP_PROJECT }} - aws_region: ${{ fromJson(inputs.aws).region }} - aws_ami: ${{ fromJson(inputs.aws).ami }} - aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} - eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} - eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} - eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} - secrets: inherit +# +#jobs: +# e2e-test: +# name: E2E Test +# uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 +# with: +# operator_type: ${{ inputs.operator_type }} +# operator_image_version: ${{ inputs.operator_image_version }} +# core_image_version: ${{ inputs.core_image_version }} +# optout_image_version: ${{ inputs.optout_image_version }} +# e2e_image_version: ${{ inputs.e2e_image_version }} +# operator_branch: ${{ github.ref }} +# branch_core: ${{ fromJson(inputs.branch).core }} +# branch_optout: ${{ fromJson(inputs.branch).optout }} +# branch_admin: ${{ fromJson(inputs.branch).admin }} +# uid2_e2e_identity_scope: ${{ inputs.identity_scope }} +# gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} +# gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} +# gcp_project: ${{ vars.GCP_PROJECT }} +# aws_region: ${{ fromJson(inputs.aws).region }} +# aws_ami: ${{ fromJson(inputs.aws).ami }} +# aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} +# eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} +# eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} +# eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} +# secrets: inherit From 2bc4e0d7c60b8a6c947de2e5042ca98f6d191145 Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:36:31 +0800 Subject: [PATCH 5/8] testing stuff --- .../workflows/run-e2e-tests-on-operator.yaml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 29ab2a81f..f828d8d1d 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -102,29 +102,29 @@ on: type: string default: '{ "pcr0": "xxxxx" }' -# -#jobs: -# e2e-test: -# name: E2E Test -# uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 -# with: -# operator_type: ${{ inputs.operator_type }} -# operator_image_version: ${{ inputs.operator_image_version }} -# core_image_version: ${{ inputs.core_image_version }} -# optout_image_version: ${{ inputs.optout_image_version }} -# e2e_image_version: ${{ inputs.e2e_image_version }} -# operator_branch: ${{ github.ref }} -# branch_core: ${{ fromJson(inputs.branch).core }} -# branch_optout: ${{ fromJson(inputs.branch).optout }} -# branch_admin: ${{ fromJson(inputs.branch).admin }} -# uid2_e2e_identity_scope: ${{ inputs.identity_scope }} -# gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} -# gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} -# gcp_project: ${{ vars.GCP_PROJECT }} -# aws_region: ${{ fromJson(inputs.aws).region }} -# aws_ami: ${{ fromJson(inputs.aws).ami }} -# aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} -# eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} -# eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} -# eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} -# secrets: inherit + +jobs: + e2e-test: + name: E2E Test attempt 2 + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 + with: + operator_type: ${{ inputs.operator_type }} + operator_image_version: ${{ inputs.operator_image_version }} + core_image_version: ${{ inputs.core_image_version }} + optout_image_version: ${{ inputs.optout_image_version }} + e2e_image_version: ${{ inputs.e2e_image_version }} + operator_branch: ${{ github.ref }} + branch_core: ${{ fromJson(inputs.branch).core }} + branch_optout: ${{ fromJson(inputs.branch).optout }} + branch_admin: ${{ fromJson(inputs.branch).admin }} + uid2_e2e_identity_scope: ${{ inputs.identity_scope }} + gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} + gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} + gcp_project: ${{ vars.GCP_PROJECT }} + aws_region: ${{ fromJson(inputs.aws).region }} + aws_ami: ${{ fromJson(inputs.aws).ami }} + aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} + eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} + eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} + eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} + secrets: inherit From 05aa1ea100c3b35604d8acda70c9bbec44bf56e4 Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:37:38 +0800 Subject: [PATCH 6/8] testing stuff --- .../workflows/run-e2e-tests-on-operator.yaml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index f828d8d1d..9d5dc8ecd 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,25 +106,25 @@ on: jobs: e2e-test: name: E2E Test attempt 2 - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 - with: - operator_type: ${{ inputs.operator_type }} - operator_image_version: ${{ inputs.operator_image_version }} - core_image_version: ${{ inputs.core_image_version }} - optout_image_version: ${{ inputs.optout_image_version }} - e2e_image_version: ${{ inputs.e2e_image_version }} - operator_branch: ${{ github.ref }} - branch_core: ${{ fromJson(inputs.branch).core }} - branch_optout: ${{ fromJson(inputs.branch).optout }} - branch_admin: ${{ fromJson(inputs.branch).admin }} - uid2_e2e_identity_scope: ${{ inputs.identity_scope }} - gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} - gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} - gcp_project: ${{ vars.GCP_PROJECT }} - aws_region: ${{ fromJson(inputs.aws).region }} - aws_ami: ${{ fromJson(inputs.aws).ami }} - aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} - eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} - eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} - eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} - secrets: inherit +# uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 +# with: +# operator_type: ${{ inputs.operator_type }} +# operator_image_version: ${{ inputs.operator_image_version }} +# core_image_version: ${{ inputs.core_image_version }} +# optout_image_version: ${{ inputs.optout_image_version }} +# e2e_image_version: ${{ inputs.e2e_image_version }} +# operator_branch: ${{ github.ref }} +# branch_core: ${{ fromJson(inputs.branch).core }} +# branch_optout: ${{ fromJson(inputs.branch).optout }} +# branch_admin: ${{ fromJson(inputs.branch).admin }} +# uid2_e2e_identity_scope: ${{ inputs.identity_scope }} +# gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} +# gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} +# gcp_project: ${{ vars.GCP_PROJECT }} +# aws_region: ${{ fromJson(inputs.aws).region }} +# aws_ami: ${{ fromJson(inputs.aws).ami }} +# aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} +# eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} +# eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} +# eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} +# secrets: inherit From 967e13496c664cfe149d883b1413dff83d4e138f Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:40:45 +0800 Subject: [PATCH 7/8] testing stuff --- .../workflows/run-e2e-tests-on-operator.yaml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index 9d5dc8ecd..bb4836be7 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,25 +106,25 @@ on: jobs: e2e-test: name: E2E Test attempt 2 -# uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3 -# with: -# operator_type: ${{ inputs.operator_type }} -# operator_image_version: ${{ inputs.operator_image_version }} -# core_image_version: ${{ inputs.core_image_version }} -# optout_image_version: ${{ inputs.optout_image_version }} -# e2e_image_version: ${{ inputs.e2e_image_version }} -# operator_branch: ${{ github.ref }} -# branch_core: ${{ fromJson(inputs.branch).core }} -# branch_optout: ${{ fromJson(inputs.branch).optout }} -# branch_admin: ${{ fromJson(inputs.branch).admin }} -# uid2_e2e_identity_scope: ${{ inputs.identity_scope }} -# gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} -# gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} -# gcp_project: ${{ vars.GCP_PROJECT }} -# aws_region: ${{ fromJson(inputs.aws).region }} -# aws_ami: ${{ fromJson(inputs.aws).ami }} -# aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} -# eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} -# eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} -# eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} -# secrets: inherit + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@doesnt-exist + with: + operator_type: ${{ inputs.operator_type }} + operator_image_version: ${{ inputs.operator_image_version }} + core_image_version: ${{ inputs.core_image_version }} + optout_image_version: ${{ inputs.optout_image_version }} + e2e_image_version: ${{ inputs.e2e_image_version }} + operator_branch: ${{ github.ref }} + branch_core: ${{ fromJson(inputs.branch).core }} + branch_optout: ${{ fromJson(inputs.branch).optout }} + branch_admin: ${{ fromJson(inputs.branch).admin }} + uid2_e2e_identity_scope: ${{ inputs.identity_scope }} + gcp_workload_identity_provider_id: ${{ vars.GCP_WORKLOAD_IDENTITY_PROVIDER_ID }} + gcp_service_account: ${{ vars.GCP_SERVICE_ACCOUNT }} + gcp_project: ${{ vars.GCP_PROJECT }} + aws_region: ${{ fromJson(inputs.aws).region }} + aws_ami: ${{ fromJson(inputs.aws).ami }} + aws_pcr0: ${{ fromJson(inputs.aws).pcr0 }} + eks_pcr0: ${{ fromJson(inputs.eks).pcr0 }} + eks_test_cluster: ${{ vars.EKS_TEST_CLUSTER }} + eks_test_cluster_region: ${{ vars.EKS_TEST_CLUSTER_REGION }} + secrets: inherit From cfd9035e797736eed58ffe2bf7b7740273bf0841 Mon Sep 17 00:00:00 2001 From: Aleksandrs Ulme Date: Fri, 14 Feb 2025 18:42:39 +0800 Subject: [PATCH 8/8] testing stuff --- .github/workflows/run-e2e-tests-on-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-e2e-tests-on-operator.yaml b/.github/workflows/run-e2e-tests-on-operator.yaml index bb4836be7..a7c75d0b3 100644 --- a/.github/workflows/run-e2e-tests-on-operator.yaml +++ b/.github/workflows/run-e2e-tests-on-operator.yaml @@ -106,7 +106,7 @@ on: jobs: e2e-test: name: E2E Test attempt 2 - uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@doesnt-exist + uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@main with: operator_type: ${{ inputs.operator_type }} operator_image_version: ${{ inputs.operator_image_version }}