Skip to content

Commit 93614b7

Browse files
committed
Revert "Use proxy for external preprod environments (#194)"
This reverts commit 57cad48.
1 parent 92975a5 commit 93614b7

File tree

3 files changed

+0
-24
lines changed

3 files changed

+0
-24
lines changed

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-ci-pipeline.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,6 @@ spec:
451451
value: "$(tasks.set-env.results.pyxis_url)"
452452
- name: pipeline_name
453453
value: "$(context.pipelineRun.name)"
454-
- name: env
455-
value: $(params.env)
456454

457455
- name: show-support-link
458456
taskRef:

ansible/roles/operator-pipeline/templates/openshift/tasks/upload-pipeline-logs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ spec:
2727
description: Operator package name
2828
- name: pipeline_name
2929
description: Tekton pipeline run name where logs will be gathered from
30-
- name: env
31-
description: Environment. One of [dev, qa, stage, prod]
3230
results:
3331
- name: pipeline_log_url
3432
workspaces:
@@ -54,8 +52,6 @@ spec:
5452
value: $(params.pyxis_cert_path)
5553
- name: PYXIS_KEY_PATH
5654
value: $(params.pyxis_key_path)
57-
- name: ENVIRONMENT
58-
value: $(params.env)
5955
script: |
6056
#! /usr/bin/env bash
6157
echo "Uploading pipeline logs"

operator-pipeline-images/operatorcert/pyxis.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,8 @@ def _get_session() -> requests.Session:
3535
api_key = os.environ.get("PYXIS_API_KEY")
3636
cert = os.environ.get("PYXIS_CERT_PATH")
3737
key = os.environ.get("PYXIS_KEY_PATH")
38-
env = os.environ.get("ENVIRONMENT")
39-
40-
# Document about the proxy configuration:
41-
# https://source.redhat.com/groups/public/customer-platform-devops/digital_experience_operations_dxp_ops_wiki/using_squid_proxy_to_access_akamai_preprod_domains_over_vpn
42-
proxies = {}
43-
# If it's external preprod
44-
if env != "prod" and api_key:
45-
proxies = {
46-
"http": "http://squid.corp.redhat.com:3128",
47-
"https": "http://squid.corp.redhat.com:3128",
48-
}
4938

5039
session = requests.Session()
51-
5240
if api_key:
5341
LOGGER.debug("Pyxis session using API key is created")
5442
session.headers.update({"X-API-KEY": api_key})
@@ -68,12 +56,6 @@ def _get_session() -> requests.Session:
6856
"Either define PYXIS_API_KEY or PYXIS_CERT_PATH + PYXIS_KEY_PATH"
6957
)
7058

71-
if proxies:
72-
LOGGER.debug(
73-
"Pyxis session configured for Proxy (external preprod environment)"
74-
)
75-
session.proxies.update(proxies)
76-
7759
return session
7860

7961

0 commit comments

Comments
 (0)