Skip to content

Commit 4e20283

Browse files
committed
[ci] Update command to get host ip in runners
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent d03cafc commit 4e20283

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ chart_render_template:
910910

911911
chart_test_autoscaling_disabled:
912912
PLATFORMS=$(PLATFORMS) TEST_CHROMIUM=true RELEASE_NAME=selenium SELENIUM_GRID_AUTOSCALING=false CHART_ENABLE_TRACING=true \
913-
SECURE_INGRESS_ONLY_GENERATE=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 EXTERNAL_UPLOADER_CONFIG=true \
913+
SECURE_INGRESS_ONLY_GENERATE=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=443 EXTERNAL_UPLOADER_CONFIG=true \
914914
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
915915
TEMPLATE_OUTPUT_FILENAME="k8s_nodeChromium_enableTracing_secureIngress_generateCerts_ingressPublicIP_subPath.yaml" \
916916
./tests/charts/make/chart_test.sh NoAutoscaling
@@ -925,7 +925,7 @@ chart_test_autoscaling_deployment_https:
925925

926926
chart_test_autoscaling_deployment:
927927
PLATFORMS=$(PLATFORMS) TEST_EXISTING_KEDA=true RELEASE_NAME=selenium CHART_ENABLE_TRACING=true TEST_PATCHED_KEDA=false \
928-
SECURE_CONNECTION_SERVER=true SECURE_USE_EXTERNAL_CERT=true SERVICE_TYPE_NODEPORT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=31444 \
928+
SECURE_CONNECTION_SERVER=true SECURE_USE_EXTERNAL_CERT=true SERVICE_TYPE_NODEPORT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=31444 \
929929
SELENIUM_GRID_AUTOSCALING_MIN_REPLICA=1 SET_MAX_REPLICAS=3 TEST_DELAY_AFTER_TEST=2 SELENIUM_GRID_MONITORING=false \
930930
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
931931
TEMPLATE_OUTPUT_FILENAME="k8s_prefixSelenium_enableTracing_secureServer_externalCerts_nodePort_autoScaling_scaledObject_existingKEDA_subPath.yaml" \
@@ -941,7 +941,7 @@ chart_test_autoscaling_job_https:
941941

942942
chart_test_autoscaling_job_hostname:
943943
PLATFORMS=$(PLATFORMS) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true BASIC_AUTH_EMBEDDED_URL=true TEST_PATCHED_KEDA=false \
944-
SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 \
944+
SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=443 \
945945
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
946946
TEMPLATE_OUTPUT_FILENAME="k8s_enableTracing_basicAuth_secureIngress_externalCerts_ingressPublicIP_autoScaling_originKEDA_scaledJob_subPath.yaml" \
947947
./tests/charts/make/chart_test.sh JobAutoscaling
@@ -956,7 +956,7 @@ chart_test_autoscaling_job:
956956
chart_test_autoscaling_playwright_connect_grid:
957957
PLATFORMS=$(PLATFORMS) CHART_ENABLE_TRACING=true CHART_ENABLE_BASIC_AUTH=true MATRIX_TESTS=CDPTests \
958958
BASIC_AUTH_USERNAME=docker-selenium BASIC_AUTH_PASSWORD=2NMI4jdBi6k7bENoeUfV25295VvzwAE9chM24a+2VL95uOHozo \
959-
SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -i) SELENIUM_GRID_PORT=443 \
959+
SECURE_INGRESS_ONLY_DEFAULT=true SECURE_USE_EXTERNAL_CERT=true SELENIUM_GRID_PROTOCOL=https SELENIUM_GRID_HOST=$$(hostname -I | cut -d' ' -f1) SELENIUM_GRID_PORT=443 \
960960
VERSION=$(TAG_VERSION) VIDEO_TAG=$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) KEDA_BASED_NAME=$(KEDA_BASED_NAME) KEDA_BASED_TAG=$(KEDA_BASED_TAG) NAMESPACE=$(NAMESPACE) BINDING_VERSION=$(BINDING_VERSION) BASE_VERSION=$(BASE_VERSION) \
961961
TEMPLATE_OUTPUT_FILENAME="k8s_playwright_connect_grid_basicAuth_secureIngress_ingressPublicIP_autoScaling_patchKEDA.yaml" \
962962
./tests/charts/make/chart_test.sh JobAutoscaling

charts/selenium-grid/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ helm install selenium-grid --set ingress.hostname=selenium-grid.k8s.local docker
8484
# Verify ingress configuration via kubectl get ingress
8585

8686
# Notes: In case you want to set hostname is selenium-grid.local. You need to add the IP and hostname to the local host file in `/etc/hosts`
87-
sudo -- sh -c -e "echo \"$(hostname -i) selenium-grid.local\" >> /etc/hosts"
87+
sudo -- sh -c -e "echo \"$(hostname -I | cut -d' ' -f1) selenium-grid.local\" >> /etc/hosts"
8888
```
8989

9090
### Installing the Nightly chart
@@ -795,7 +795,7 @@ For example (replace `$RELEASENAME` and `$NAMESPACE` with your values):
795795

796796
```bash
797797
helm upgrade -i $RELEASENAME -n $NAMESPACE docker-selenium/selenium-grid \
798-
--set global.K8S_PUBLIC_IP=$(hostname -i) \
798+
--set global.K8S_PUBLIC_IP=$(hostname -I | cut -d' ' -f1) \
799799
--set tls.ingress.enableWithController=true \
800800
--set tls.create=false \
801801
--set tls.nameOverride=my-external-tls-secret \

charts/selenium-grid/certs/gen-cert-helper.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SERVER_KEYSTORE=${SERVER_KEYSTORE:-server.jks}
3030
SERVER_KEYSTORE_PASSPWD=${SERVER_KEYSTORE_PASSPWD:-server.pass}
3131
BASE64_ONLY=${BASE64_ONLY:-0}
3232
if [ -n "${ADD_IP_ADDRESS}" ] && [ "${ADD_IP_ADDRESS}" = "hostname" ]; then
33-
ADD_IP_ADDRESS=",IP:$(hostname -I | awk '{print $1}')"
33+
ADD_IP_ADDRESS=",IP:$(hostname -I | cut -d' ' -f1)"
3434
else
3535
ADD_IP_ADDRESS=${ADD_IP_ADDRESS}
3636
fi

tests/charts/make/chart_test.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -191,16 +191,16 @@ fi
191191

192192
if [ "${CHART_ENABLE_INGRESS_HOSTNAME}" = "true" ]; then
193193
if [[ ! $(cat /etc/hosts) == *"${HOSTNAME_ADDRESS}"* ]]; then
194-
sudo -- sh -c -e "echo \"$(hostname -i) ${HOSTNAME_ADDRESS}\" >> /etc/hosts"
194+
sudo -- sh -c -e "echo \"$(hostname -I | cut -d' ' -f1) ${HOSTNAME_ADDRESS}\" >> /etc/hosts"
195195
fi
196196
if [[ ! $(cat /etc/hosts) == *"alertmanager.${HOSTNAME_ADDRESS}"* ]]; then
197-
sudo -- sh -c -e "echo \"$(hostname -i) alertmanager.${HOSTNAME_ADDRESS}\" >> /etc/hosts"
197+
sudo -- sh -c -e "echo \"$(hostname -I | cut -d' ' -f1) alertmanager.${HOSTNAME_ADDRESS}\" >> /etc/hosts"
198198
fi
199199
if [[ ! $(cat /etc/hosts) == *"grafana.${HOSTNAME_ADDRESS}"* ]]; then
200-
sudo -- sh -c -e "echo \"$(hostname -i) grafana.${HOSTNAME_ADDRESS}\" >> /etc/hosts"
200+
sudo -- sh -c -e "echo \"$(hostname -I | cut -d' ' -f1) grafana.${HOSTNAME_ADDRESS}\" >> /etc/hosts"
201201
fi
202202
if [[ ! $(cat /etc/hosts) == *"pts.${HOSTNAME_ADDRESS}"* ]]; then
203-
sudo -- sh -c -e "echo \"$(hostname -i) pts.${HOSTNAME_ADDRESS}\" >> /etc/hosts"
203+
sudo -- sh -c -e "echo \"$(hostname -I | cut -d' ' -f1) pts.${HOSTNAME_ADDRESS}\" >> /etc/hosts"
204204
fi
205205
ping -c 2 ${HOSTNAME_ADDRESS}
206206
HELM_COMMAND_SET_IMAGES="${HELM_COMMAND_SET_IMAGES} \
@@ -250,7 +250,7 @@ if [ "${SECURE_INGRESS_ONLY_GENERATE}" = "true" ] && [ "${RENDER_HELM_TEMPLATE_O
250250
--set tls.ingress.generateTLS=true \
251251
--set tls.ingress.defaultCN=${SELENIUM_GRID_HOST} \
252252
--set tls.ingress.defaultSANList[0]=${SELENIUM_GRID_HOST} \
253-
--set tls.ingress.defaultIPList[0]=$(hostname -I | awk '{print $1}') \
253+
--set tls.ingress.defaultIPList[0]=$(hostname -I | cut -d' ' -f1) \
254254
"
255255
fi
256256

0 commit comments

Comments
 (0)