Skip to content

Commit 71c0b86

Browse files
joe1234wufacebook-github-bot
authored andcommitted
Delete Smart agent package in B&R extract/upload script (facebookresearch#2400)
Summary: Smart agent was't release to production but we changed to tee-pl solution. thus this MPC solution is safe to delete and smart agent is never productionized and used in production code. Cleaning up the unused code in MPC B&R extract/upload script Reviewed By: wenhaizhu Differential Revision: D57076695
1 parent ff6b148 commit 71c0b86

File tree

5 files changed

+6
-29
lines changed

5 files changed

+6
-29
lines changed

binaries_out_lists/smart_agent.txt

-1
This file was deleted.

extract-docker-binaries.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@ set -e
99
PROG_NAME=$0
1010
usage() {
1111
cat << EOF >&2
12-
Usage: $PROG_NAME <emp_games|data_processing|pid|validation|smart_agent> [-t TAG] [-d DOCKER_IMAGE_NAME]
12+
Usage: $PROG_NAME <emp_games|data_processing|pid|validation> [-t TAG] [-d DOCKER_IMAGE_NAME]
1313
1414
package:
1515
emp_games - extracts the binaries from fbpcs/emp-games docker image
1616
data_processing - extracts the binaries from fbpcs/data-processing docker image
1717
pid - extracts the binaries from private-id docker image
1818
validation - extracts the binaries from the onedocker docker image
19-
smart_agent - extracts the binaries from the onedocker docker image
2019
-t TAG: uses the image with the given tag (default: latest)
2120
-d DOCKER_IMAGE_NAME: defines the image name to extract from
2221
EOF
2322
exit 1
2423
}
2524

26-
PACKAGES="emp_games data_processing pid validation smart_agent"
25+
PACKAGES="emp_games data_processing pid validation"
2726
PACKAGE=$1
2827
if [[ ! " $PACKAGES " =~ $PACKAGE ]]; then
2928
usage
@@ -53,7 +52,6 @@ if [ -z "$DOCKER_IMAGE_NAME" ]; then
5352
data_processing) DOCKER_IMAGE_NAME="fbpcs/data-processing";;
5453
pid) DOCKER_IMAGE_NAME="fbpcs/onedocker/test";;
5554
validation) DOCKER_IMAGE_NAME="fbpcs/onedocker/test";;
56-
smart_agent) DOCKER_IMAGE_NAME="fbpcs/onedocker/test";;
5755
esac
5856
fi
5957
DOCKER_IMAGE_PATH="${DOCKER_IMAGE_NAME}:${TAG}"
@@ -108,8 +106,3 @@ if [ "$PACKAGE" = "validation" ]; then
108106
docker create -ti --name "$TEMP_CONTAINER_NAME" "${DOCKER_IMAGE_PATH}"
109107
docker cp "$TEMP_CONTAINER_NAME":/usr/local/bin/pc_pre_validation_cli "$SCRIPT_DIR/binaries_out/."
110108
fi
111-
112-
if [ "$PACKAGE" = "smart_agent" ]; then
113-
docker create -ti --name "$TEMP_CONTAINER_NAME" "${DOCKER_IMAGE_PATH}"
114-
docker cp "$TEMP_CONTAINER_NAME":/usr/local/bin/smart_agent_server "$SCRIPT_DIR/binaries_out/."
115-
fi

promote_scripts/promote_binaries.sh

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ binary_names=(
4141
'data_processing/attribution_id_combiner'
4242
'data_processing/private_id_dfca_id_combiner'
4343
'validation/pc_pre_validation_cli'
44-
'smart_agent/smart_agent_server'
4544
'udp_encryptor'
4645
)
4746

upload-binaries-to-s3-test.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,19 @@ set -e
99
PROG_NAME=$0
1010
usage() {
1111
cat << EOF >&2
12-
Usage: $PROG_NAME <emp_games|data_processing|pid|validation|smart_agent> <tag>
12+
Usage: $PROG_NAME <emp_games|data_processing|pid|validation> <tag>
1313
1414
package:
1515
emp_games - extracts the binaries from fbpcs/emp-games docker image
1616
data_processing - extracts the binaries from fbpcs/data-processing docker image
1717
pid - extracts the binaries from private-id docker image
1818
validation - extracts the binaries from the onedocker docker image
19-
smart_agent - extracts the binaries from the onedocker docker image
2019
tag: used to determine the subfolder/version in s3 for each binary
2120
EOF
2221
exit 1
2322
}
2423

25-
PACKAGES="emp_games data_processing pid validation smart_agent"
24+
PACKAGES="emp_games data_processing pid validation"
2625
PACKAGE=$1
2726
TAG=$2
2827
if [[ ! " $PACKAGES " =~ $PACKAGE ]] || [[ ! " $TAG " =~ $TAG ]]; then
@@ -45,7 +44,6 @@ private_id_dfca_aggregator_package="s3://$one_docker_repo/private_id_dfca/privat
4544
data_processing_repo="s3://$one_docker_repo/data_processing"
4645
private_id_repo="s3://$one_docker_repo/pid"
4746
validation_repo="s3://$one_docker_repo/validation"
48-
smart_agent_repo="s3://$one_docker_repo/smart_agent"
4947
udp_encryptor_package="s3://$one_docker_repo/data_processing/unified_data_process/udp_encryptor/${TAG}/udp_encryptor"
5048

5149
if [ "$PACKAGE" = "emp_games" ]; then
@@ -88,8 +86,3 @@ if [ "$PACKAGE" = "validation" ]; then
8886
cd binaries_out || exit
8987
aws s3 cp pc_pre_validation_cli "$validation_repo/pc_pre_validation_cli/${TAG}/pc_pre_validation_cli"
9088
fi
91-
92-
if [ "$PACKAGE" = "smart_agent" ]; then
93-
cd binaries_out || exit
94-
aws s3 cp smart_agent_server "$smart_agent_repo/smart_agent_server/${TAG}/smart_agent_server"
95-
fi

upload_scripts/upload-binaries-using-onedocker.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ set -e
99
PROG_NAME=$0
1010
usage() {
1111
cat << EOF >&2
12-
Usage: $PROG_NAME <emp_games|data_processing|pid|validation|smart_agent> <tag> -c <config>
12+
Usage: $PROG_NAME <emp_games|data_processing|pid|validation> <tag> -c <config>
1313
1414
package:
1515
emp_games - extracts the binaries from fbpcs/emp-games docker image
1616
data_processing - extracts the binaries from fbpcs/data-processing docker image
1717
pid - extracts the binaries from private-id docker image
1818
validation - extracts the binaries from the onedocker docker image
19-
smart_agent - extracts the binaries from the onedocker docker image
2019
2120
tag: used to determine the subfolder/version in s3 for each binary
2221
@@ -25,7 +24,7 @@ EOF
2524
exit 1
2625
}
2726

28-
PACKAGES="emp_games data_processing pid validation smart_agent"
27+
PACKAGES="emp_games data_processing pid validation"
2928
PACKAGE=$1
3029
TAG=$2
3130

@@ -107,9 +106,3 @@ cd binaries_out || exit
107106
onedocker_upload validation/pc_pre_validation_cli pc_pre_validation_cli
108107
cd .. || exit
109108
fi
110-
111-
if [ "$PACKAGE" = "smart_agent" ]; then
112-
cd binaries_out || exit
113-
onedocker_upload smart_agent/smart_agent_server smart_agent_server
114-
cd .. || exit
115-
fi

0 commit comments

Comments
 (0)