From 9c5e04d7a300771b9a0992881ab7373a30a2c5c9 Mon Sep 17 00:00:00 2001 From: Tal Davidi Date: Mon, 23 Jan 2023 11:28:13 -0800 Subject: [PATCH 1/3] Run RC UDP Github workflow during automated build process (#2053) Summary: Pull Request resolved: https://github.com/facebookresearch/fbpcs/pull/2053 Differential Revision: D42654086 Privacy Context Container: L416713 fbshipit-source-id: 154405ff15d2c3a2d7df1f6e6528481ff7740025 --- .../github/rc_udp_config_one_command_runner_test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml b/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml index 2b26ccb6c..cdec074ef 100644 --- a/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml +++ b/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml @@ -7,15 +7,15 @@ private_computation: ContainerService: class: fbpcp.service.container_aws.AWSContainerService constructor: - region: us-west-2 - cluster: onedocker-cluster-udp-pl-rc-test - subnets: [subnet-0371dbbee14f8f649, subnet-0c3123cf639369ef2, subnet-02b5a129b03ef0654, subnet-031731e93a9fd13ab,] + region: us-west-1 + cluster: onedocker-cluster-udp-pl-rc-test2 + subnets: [subnet-08e2d14083fd21e3f,subnet-08059e3d327d9f4f4] access_key_id: access_key_data: StorageService: class: fbpcp.service.storage_s3.S3StorageService constructor: - region: us-west-2 + region: us-west-1 access_key_id: access_key_data: ValidationConfig: @@ -28,7 +28,7 @@ private_computation: binary_version: latest OneDockerServiceConfig: constructor: - task_definition: onedocker-task-udp-pl-rc-test:1#onedocker-container-udp-pl-rc-test + task_definition: onedocker-task-udp-pl-rc-test2:1#onedocker-container-udp-pl-rc-test2 pid: dependency: mpc: From 7f5161871a8a2b7894a4f17862484fb956f7c00f Mon Sep 17 00:00:00 2001 From: Tal Davidi Date: Mon, 23 Jan 2023 14:05:08 -0800 Subject: [PATCH 2/3] Run RC UDP Github workflow during automated build process (#2053) Summary: Pull Request resolved: https://github.com/facebookresearch/fbpcs/pull/2053 Differential Revision: D42654086 Privacy Context Container: L416713 fbshipit-source-id: cf98e403f15f1ebee9d7b799dda7ab8cac0508b5 --- .github/workflows/rc_udp_one_command_runner_test.yml | 10 +++++----- .../github/rc_udp_config_one_command_runner_test.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rc_udp_one_command_runner_test.yml b/.github/workflows/rc_udp_one_command_runner_test.yml index 50cf1187b..02bf00270 100644 --- a/.github/workflows/rc_udp_one_command_runner_test.yml +++ b/.github/workflows/rc_udp_one_command_runner_test.yml @@ -15,11 +15,11 @@ on: input_path: description: S3 path to synthetic data required: true - default: https://fbpcs-github-e2e.s3.us-west-2.amazonaws.com/lift/inputs/partner_e2e_input.csv + default: https://fbpcs-github-e2e-runner.s3.us-west-2.amazonaws.com/lift/inputs/partner_e2e_input.csv expected_result_path: description: S3 path to expected results from synthetic run required: true - default: https://fbpcs-github-e2e.s3.us-west-2.amazonaws.com/lift/results/partner_expected_result_pcf2.json + default: https://fbpcs-github-e2e-runner.s3.us-west-2.amazonaws.com/lift/results/partner_expected_result_pcf2.json tag: description: Version tag to use required: true @@ -57,13 +57,13 @@ jobs: - name: Get AWS Session name id: aws_session_name run: | - echo session_name=$(echo PL-RC-E2E-Tests-${{ inputs.build_id }} | tr " " "-") >> $GITHUB_OUTPUT + echo session_name=$(echo PL-RC-UDP-E2E-Tests-${{ inputs.build_id }} | tr " " "-") >> $GITHUB_OUTPUT - name: Set AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: - role-to-assume: ${{ secrets.AWS_E2E_TEST_ROLE_TO_ASSUME }} - aws-region: us-west-2 + role-to-assume: ${{ secrets.AWS_E2E_UDP_TEST_ROLE_TO_ASSUME }} + aws-region: us-west-1 role-duration-seconds: 5400 role-session-name: ${{ steps.aws_session_name.outputs.session_name }} diff --git a/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml b/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml index 2b26ccb6c..cdec074ef 100644 --- a/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml +++ b/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml @@ -7,15 +7,15 @@ private_computation: ContainerService: class: fbpcp.service.container_aws.AWSContainerService constructor: - region: us-west-2 - cluster: onedocker-cluster-udp-pl-rc-test - subnets: [subnet-0371dbbee14f8f649, subnet-0c3123cf639369ef2, subnet-02b5a129b03ef0654, subnet-031731e93a9fd13ab,] + region: us-west-1 + cluster: onedocker-cluster-udp-pl-rc-test2 + subnets: [subnet-08e2d14083fd21e3f,subnet-08059e3d327d9f4f4] access_key_id: access_key_data: StorageService: class: fbpcp.service.storage_s3.S3StorageService constructor: - region: us-west-2 + region: us-west-1 access_key_id: access_key_data: ValidationConfig: @@ -28,7 +28,7 @@ private_computation: binary_version: latest OneDockerServiceConfig: constructor: - task_definition: onedocker-task-udp-pl-rc-test:1#onedocker-container-udp-pl-rc-test + task_definition: onedocker-task-udp-pl-rc-test2:1#onedocker-container-udp-pl-rc-test2 pid: dependency: mpc: From 44d6b370fbb78e603127e928760587d8ddf86950 Mon Sep 17 00:00:00 2001 From: Tal Davidi Date: Mon, 23 Jan 2023 14:47:51 -0800 Subject: [PATCH 3/3] Run RC UDP Github workflow during automated build process (#2053) Summary: Pull Request resolved: https://github.com/facebookresearch/fbpcs/pull/2053 Differential Revision: D42654086 Privacy Context Container: L416713 fbshipit-source-id: 98b26a9694f090dcda0978356e6b2631ff09383f --- .github/workflows/rc_udp_one_command_runner_test.yml | 10 +++++----- .../github/rc_udp_config_one_command_runner_test.yml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rc_udp_one_command_runner_test.yml b/.github/workflows/rc_udp_one_command_runner_test.yml index 50cf1187b..2abe9c1d9 100644 --- a/.github/workflows/rc_udp_one_command_runner_test.yml +++ b/.github/workflows/rc_udp_one_command_runner_test.yml @@ -15,11 +15,11 @@ on: input_path: description: S3 path to synthetic data required: true - default: https://fbpcs-github-e2e.s3.us-west-2.amazonaws.com/lift/inputs/partner_e2e_input.csv + default: https://fbpcs-github-e2e-runner.s3.us-west-1.amazonaws.com/lift/inputs/partner_e2e_input.csv expected_result_path: description: S3 path to expected results from synthetic run required: true - default: https://fbpcs-github-e2e.s3.us-west-2.amazonaws.com/lift/results/partner_expected_result_pcf2.json + default: https://fbpcs-github-e2e-runner.s3.us-west-1.amazonaws.com/lift/results/partner_expected_result_pcf2.json tag: description: Version tag to use required: true @@ -57,13 +57,13 @@ jobs: - name: Get AWS Session name id: aws_session_name run: | - echo session_name=$(echo PL-RC-E2E-Tests-${{ inputs.build_id }} | tr " " "-") >> $GITHUB_OUTPUT + echo session_name=$(echo PL-RC-UDP-E2E-Tests-${{ inputs.build_id }} | tr " " "-") >> $GITHUB_OUTPUT - name: Set AWS credentials uses: aws-actions/configure-aws-credentials@v1 with: - role-to-assume: ${{ secrets.AWS_E2E_TEST_ROLE_TO_ASSUME }} - aws-region: us-west-2 + role-to-assume: ${{ secrets.AWS_E2E_UDP_TEST_ROLE_TO_ASSUME }} + aws-region: us-west-1 role-duration-seconds: 5400 role-session-name: ${{ steps.aws_session_name.outputs.session_name }} diff --git a/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml b/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml index 2b26ccb6c..cdec074ef 100644 --- a/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml +++ b/fbpcs/tests/github/rc_udp_config_one_command_runner_test.yml @@ -7,15 +7,15 @@ private_computation: ContainerService: class: fbpcp.service.container_aws.AWSContainerService constructor: - region: us-west-2 - cluster: onedocker-cluster-udp-pl-rc-test - subnets: [subnet-0371dbbee14f8f649, subnet-0c3123cf639369ef2, subnet-02b5a129b03ef0654, subnet-031731e93a9fd13ab,] + region: us-west-1 + cluster: onedocker-cluster-udp-pl-rc-test2 + subnets: [subnet-08e2d14083fd21e3f,subnet-08059e3d327d9f4f4] access_key_id: access_key_data: StorageService: class: fbpcp.service.storage_s3.S3StorageService constructor: - region: us-west-2 + region: us-west-1 access_key_id: access_key_data: ValidationConfig: @@ -28,7 +28,7 @@ private_computation: binary_version: latest OneDockerServiceConfig: constructor: - task_definition: onedocker-task-udp-pl-rc-test:1#onedocker-container-udp-pl-rc-test + task_definition: onedocker-task-udp-pl-rc-test2:1#onedocker-container-udp-pl-rc-test2 pid: dependency: mpc: