Skip to content

Commit f16102f

Browse files
malfetfacebook-github-bot
authored andcommitted
Revert D29892919: Add squid proxy as egress cache
Test Plan: revert-hammer Differential Revision: D29892919 (pytorch@e63160d) Original commit changeset: ac17227f2553 fbshipit-source-id: b78313147d60f26c1df68a25293e6b571ba66919
1 parent cf1f594 commit f16102f

17 files changed

+0
-57
lines changed

.github/templates/bazel_ci_workflow.yml.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ name: Bazel Linux CI (!{{ build_environment }})
6060
-e CUSTOM_TEST_ARTIFACT_BUILD_DIR \
6161
-e SKIP_SCCACHE_INITIALIZATION=1 \
6262
-e TORCH_CUDA_ARCH_LIST \
63-
-e http_proxy="$SQUID_PROXY" -e https_proxy="$SQUID_PROXY" \
6463
--env-file="/tmp/github_env_${GITHUB_RUN_ID}" \
6564
--security-opt seccomp=unconfined \
6665
--cap-add=SYS_PTRACE \
@@ -104,7 +103,6 @@ name: Bazel Linux CI (!{{ build_environment }})
104103
-e JOB_BASE_NAME \
105104
-e MAX_JOBS="$(nproc --ignore=2)" \
106105
-e SCCACHE_BUCKET \
107-
-e http_proxy="$SQUID_PROXY" -e https_proxy="$SQUID_PROXY" \
108106
--env-file="/tmp/github_env_${GITHUB_RUN_ID}" \
109107
--security-opt seccomp=unconfined \
110108
--cap-add=SYS_PTRACE \

.github/templates/linux_ci_workflow.yml.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ env:
3838
# Used for custom_opertor, jit_hooks, custom_backend, see .jenkins/pytorch/build.sh
3939
CUSTOM_TEST_ARTIFACT_BUILD_DIR: build/custom_test_artifacts
4040
ALPINE_IMAGE: "308535385114.dkr.ecr.us-east-1.amazonaws.com/tool/alpine"
41-
SQUID_PROXY: "http://tf-lb-20210722035235925400000002-1698082088.us-east-1.elb.amazonaws.com:3128"
4241

4342
concurrency:
4443
group: !{{ build_environment }}-${{ github.event.pull_request.number || github.sha }}
@@ -167,7 +166,6 @@ jobs:
167166
-e CUSTOM_TEST_ARTIFACT_BUILD_DIR \
168167
-e SKIP_SCCACHE_INITIALIZATION=1 \
169168
-e TORCH_CUDA_ARCH_LIST \
170-
-e http_proxy="$SQUID_PROXY" -e https_proxy="$SQUID_PROXY" \
171169
--env-file="/tmp/github_env_${GITHUB_RUN_ID}" \
172170
--security-opt seccomp=unconfined \
173171
--cap-add=SYS_PTRACE \
@@ -344,7 +342,6 @@ jobs:
344342
-e NUM_TEST_SHARDS \
345343
-e MAX_JOBS="$(nproc --ignore=2)" \
346344
-e SCCACHE_BUCKET \
347-
-e http_proxy="$SQUID_PROXY" -e https_proxy="$SQUID_PROXY" \
348345
--env-file="/tmp/github_env_${GITHUB_RUN_ID}" \
349346
--security-opt seccomp=unconfined \
350347
--cap-add=SYS_PTRACE \

.github/templates/windows_ci_workflow.yml.j2

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ env:
3636
VC_VERSION: ""
3737
VS_VERSION: "16.8.6"
3838
VC_YEAR: "2019"
39-
SQUID_PROXY: "http://tf-lb-20210722035235925400000002-1698082088.us-east-1.elb.amazonaws.com:3128"
4039
{%- if cuda_version != "cpu" %}
4140
TORCH_CUDA_ARCH_LIST: "7.0"
4241
USE_CUDA: 1
@@ -65,8 +64,6 @@ jobs:
6564
needs: [!{{ ciflow_config.root_job_name }}]
6665
env:
6766
JOB_BASE_NAME: !{{ build_environment }}-build
68-
http_proxy: ${{ env.SQUID_PROXY }}
69-
https_proxy: ${{ env.SQUID_PROXY }}
7067
steps:
7168
- name: Checkout PyTorch
7269
uses: actions/checkout@v2
@@ -156,8 +153,6 @@ jobs:
156153
SHARD_NUMBER: ${{ matrix.shard }}
157154
NUM_TEST_SHARDS: ${{ matrix.num_shards }}
158155
TEST_CONFIG: ${{ matrix.config }}
159-
http_proxy: ${{ env.SQUID_PROXY }}
160-
https_proxy: ${{ env.SQUID_PROXY }}
161156
needs: [build, generate-test-matrix, !{{ ciflow_config.root_job_name }}]
162157
strategy:
163158
matrix: ${{ fromJson(needs.generate-test-matrix.outputs.matrix) }}

.github/workflows/periodic-pytorch-libtorch-linux-xenial-cuda11.3-cudnn8-py3.6-gcc7.yml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/periodic-pytorch-linux-xenial-cuda11.3-cudnn8-py3.6-gcc7.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/periodic-pytorch-win-vs2019-cuda11-cudnn8-py3.yml

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-libtorch-linux-xenial-cuda10.2-cudnn7-py3.6-gcc7.yml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-libtorch-linux-xenial-cuda11.1-cudnn8-py3.6-gcc7.yml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-linux-bionic-cuda10.2-cudnn7-py3.9-gcc7.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-linux-bionic-py3.8-gcc9-coverage.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-linux-xenial-cuda10.2-cudnn7-py3.6-gcc7.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-linux-xenial-cuda11.1-cudnn8-py3.6-gcc7.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-linux-xenial-py3.6-gcc5.4.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-linux-xenial-py3.6-gcc7-bazel-test.yml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-win-vs2019-cpu-py3.yml

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-win-vs2019-cuda10-cudnn7-py3.yml

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pytorch-win-vs2019-cuda11-cudnn8-py3.yml

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)