Skip to content

[WIP] no-op change to kick off test #11510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ewolinetz wants to merge 3 commits into from
Closed

[WIP] no-op change to kick off test #11510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68919d8
no-op change to kick off test
ewolinetz Sep 1, 2020
f29d0e4
fixing up systemd unit
ewolinetz Sep 1, 2020
2ff1887
debugging removing all units
ewolinetz Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 6 additions & 18 deletions ci-operator/step-registry/ipi/conf/aws/proxy/ipi-conf-aws-proxy-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,24 +74,6 @@ cat > /tmp/proxy.ign << EOF
"mode": 420
}
]
},
"systemd": {
"units": [
{
"contents": "[Service]\n\nExecStart=bash /etc/squid.sh\n\n[Install]\nWantedBy=multi-user.target\n",
"enabled": true,
"name": "squid.service"
},
{
"dropins": [
{
"contents": "[Service]\nExecStart=\nExecStart=/usr/lib/systemd/systemd-journal-gatewayd \\\n --key=/opt/openshift/tls/journal-gatewayd.key \\\n --cert=/opt/openshift/tls/journal-gatewayd.crt \\\n --trust=/opt/openshift/tls/root-ca.crt\n",
"name": "certs.conf"
}
],
"name": "systemd-journal-gatewayd.service"
}
]
}
}
EOF
Expand Down Expand Up @@ -308,6 +290,9 @@ EOF
# define squid.sh
SQUID_SH="$(base64 -w0 << EOF
#!/bin/bash

set -x

podman run --entrypoint='["bash", "/squid/proxy.sh"]' --expose=3128 --net host --volume /etc/squid:/squid:Z ${PROXY_IMAGE}
EOF
)"
Expand All @@ -326,6 +311,7 @@ squid -N -f /squid/squid.conf
EOF
)"

# no-op

# create ignition entries for certs and script to start squid and systemd unit entry
# create the proxy stack and then get its IP
Expand Down Expand Up @@ -385,3 +371,5 @@ proxy:
httpsProxy: ${PROXY_URL}
httpProxy: ${PROXY_URL}
EOF

echo "using ignition: $(cat /tmp/proxy.ign)"
2 changes: 2 additions & 0 deletions ci-operator/step-registry/ipi/deprovision/proxy/ipi-deprovision-proxy-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ set -o nounset
set -o errexit
set -o pipefail

set -x

trap 'CHILDREN=$(jobs -p); if test -n "${CHILDREN}"; then kill ${CHILDREN} && wait; fi' TERM

export AWS_SHARED_CREDENTIALS_FILE="${CLUSTER_PROFILE_DIR}/.awscred"
Expand Down