This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 06504e3860 Fix the TP GHA Tests (#7791)
06504e3860 is described below
commit 06504e38606a57d23d509dd5132ac0dc6287d00a
Author: Steve Hamrick <[email protected]>
AuthorDate: Fri Sep 8 09:12:44 2023 -0600
Fix the TP GHA Tests (#7791)
Fix TP GHA
Co-authored-by: Steve Hamrick <[email protected]>
---
.github/actions/tp-integration-tests/entrypoint.sh | 10 +--
.github/workflows/tp.integration.tests.yml | 6 +-
traffic_portal/test/integration/package-lock.json | 97 +++++++++++-----------
traffic_portal/test/integration/package.json | 3 +-
4 files changed, 57 insertions(+), 59 deletions(-)
diff --git a/.github/actions/tp-integration-tests/entrypoint.sh
b/.github/actions/tp-integration-tests/entrypoint.sh
index 30a8d385a6..d2f908f45a 100755
--- a/.github/actions/tp-integration-tests/entrypoint.sh
+++ b/.github/actions/tp-integration-tests/entrypoint.sh
@@ -27,7 +27,7 @@ onFail() {
if [[ -f "${REPO_DIR}/traffic_ops/traffic_ops_golang/out.log" ]]; then
mv "${REPO_DIR}/traffic_ops/traffic_ops_golang/out.log" Reports/to.log
fi
- docker logs $CHROMIUM_CONTAINER > Reports/chromium.log 2>&1;
+ docker logs $CHROME_CONTAINER > Reports/chromium.log 2>&1;
docker logs $HUB_CONTAINER > Reports/hub.log 2>&1;
echo "Detailed logs produced info Reports artifact"
exit 1
@@ -82,9 +82,9 @@ sudo apt-get install -y --no-install-recommends gettext curl
sudo npm i -g pm2 grunt sass
-CHROMIUM_CONTAINER=$(docker ps -qf name=chromium)
+CHROME_CONTAINER=$(docker ps -qf name=chrome)
HUB_CONTAINER=$(docker ps -qf name=hub)
-CHROMIUM_VER=$(docker exec "$CHROMIUM_CONTAINER" chromium --version | grep -Eo
'[0-9.]+')
+CHROME_VER=$(docker exec "$CHROME_CONTAINER" google-chrome --version | grep
-Eo '[0-9.]+')
export GOPATH="${HOME}/go"
readonly ORG_DIR="$GOPATH/src/github.com/apache"
@@ -124,7 +124,7 @@ popd
cd "${REPO_DIR}/traffic_portal/test/integration"
npm ci
-npx webdriver-manager update --gecko false --versions.chrome
"LATEST_RELEASE_$CHROMIUM_VER"
+npx webdriver-manager update --gecko false --versions.chrome
"LATEST_RELEASE_$CHROME_VER"
jq " .capabilities.chromeOptions.args = [
\"--headless\",
@@ -135,8 +135,6 @@ jq " .capabilities.chromeOptions.args = [
| .capabilities[\"goog:chromeOptions\"].w3c = false |
.capabilities.chromeOptions.w3c = false" \
config.json > config.json.tmp && mv config.json.tmp config.json
-npm run build
-
# Wait for tp/to build
timeout 5m bash <<TMOUT
while ! curl -Lvsk "${tp_fqdn}/api/5.0/ping" >/dev/null 2>&1; do
diff --git a/.github/workflows/tp.integration.tests.yml
b/.github/workflows/tp.integration.tests.yml
index f234c7f0a3..17fb097fac 100644
--- a/.github/workflows/tp.integration.tests.yml
+++ b/.github/workflows/tp.integration.tests.yml
@@ -93,14 +93,14 @@ jobs:
runs-on: ubuntu-latest
services:
hub:
- image: selenium/hub
+ image: selenium/hub:4.8.1
ports:
- 4442:4442
- 4443:4443
- 4444:4444
options: --health-cmd=/opt/bin/check-grid.sh --health-interval=5s
--health-timeout=15s --health-retries=5
- chromium:
- image: ossalternatives/selenium-node-chromium
+ chrome:
+ image: selenium/node-chrome:110.0
env:
SE_EVENT_BUS_HOST: hub
SE_EVENT_BUS_PUBLISH_PORT: 4442
diff --git a/traffic_portal/test/integration/package-lock.json
b/traffic_portal/test/integration/package-lock.json
index c994d5284a..8977c5a245 100644
--- a/traffic_portal/test/integration/package-lock.json
+++ b/traffic_portal/test/integration/package-lock.json
@@ -22,7 +22,8 @@
"protractor-beautiful-reporter": "^1.3.6",
"protractor-html-reporter-2": "^1.0.4",
"random-ipv6": "^1.0.2",
- "selenium-webdriver": "^4.0.0-alpha.8",
+ "selenium-webdriver": "^4.12.0",
+ "webdriver-manager": "^12.1.9",
"xlsx": "^0.17.0"
},
"devDependencies": {
@@ -113,11 +114,11 @@
}
},
"node_modules/adm-zip": {
- "version": "0.4.16",
- "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz";,
- "integrity":
"sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==",
+ "version": "0.5.10",
+ "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz";,
+ "integrity":
"sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==",
"engines": {
- "node": ">=0.3.0"
+ "node": ">=6.0"
}
},
"node_modules/agent-base": {
@@ -565,9 +566,9 @@
}
},
"node_modules/deep-is": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";,
- "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz";,
+ "integrity":
"sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"dev": true
},
"node_modules/delayed-stream": {
@@ -1016,9 +1017,9 @@
"dev": true
},
"node_modules/is2": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.6.tgz";,
- "integrity":
"sha512-+Z62OHOjA6k2sUDOKXoZI3EXv7Fb1K52jpTBLbkfx62bcUeSsrTBLhEquCRDKTx0XE5XbHcG/S2vrtE3lnEDsQ==",
+ "version": "2.0.9",
+ "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz";,
+ "integrity":
"sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==",
"dev": true,
"dependencies": {
"deep-is": "^0.1.3",
@@ -1778,17 +1779,16 @@
"integrity":
"sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
},
"node_modules/selenium-webdriver": {
- "version": "4.0.0-beta.2",
- "resolved":
"https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.2.tgz";,
- "integrity":
"sha512-uuNl3T1JjhrXCO4UAAy+iIIgZ/PqgYNiYvy+yfWCY+x2vHH9y7tIdD9a/q1rwbf/5jD/ENwYlVuNj46uIngknA==",
+ "version": "4.12.0",
+ "resolved":
"https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.12.0.tgz";,
+ "integrity":
"sha512-zvPzmTsky6WfO6+BGMj2mCJsw7qKnfQONur2b+pGn8jeTiC+WAUOthZOnaK+HkX5wiU6L4uoMF+JIcOVstp25A==",
"dependencies": {
- "jszip": "^3.5.0",
- "rimraf": "^2.7.1",
+ "jszip": "^3.10.1",
"tmp": "^0.2.1",
- "ws": "^7.3.1"
+ "ws": ">=8.13.0"
},
"engines": {
- "node": ">= 10.15.0"
+ "node": ">= 14.20.0"
}
},
"node_modules/semver": {
@@ -2116,11 +2116,11 @@
}
},
"node_modules/webdriver-manager": {
- "version": "12.1.8",
- "resolved":
"https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.8.tgz";,
- "integrity":
"sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==",
+ "version": "12.1.9",
+ "resolved":
"https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.9.tgz";,
+ "integrity":
"sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==",
"dependencies": {
- "adm-zip": "^0.4.9",
+ "adm-zip": "^0.5.2",
"chalk": "^1.1.1",
"del": "^2.2.0",
"glob": "^7.0.3",
@@ -2283,15 +2283,15 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"node_modules/ws": {
- "version": "7.5.7",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz";,
- "integrity":
"sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+ "version": "8.14.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.0.tgz";,
+ "integrity":
"sha512-WR0RJE9Ehsio6U4TuM+LmunEsjQ5ncHlw4sn9ihD6RoJKZrVyH9FWV3dmnwu8B2aNib1OvG2X6adUCyFpQyWcg==",
"engines": {
- "node": ">=8.3.0"
+ "node": ">=10.0.0"
},
"peerDependencies": {
"bufferutil": "^4.0.1",
- "utf-8-validate": "^5.0.2"
+ "utf-8-validate": ">=5.0.2"
},
"peerDependenciesMeta": {
"bufferutil": {
@@ -2475,9 +2475,9 @@
}
},
"adm-zip": {
- "version": "0.4.16",
- "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.16.tgz";,
- "integrity":
"sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg=="
+ "version": "0.5.10",
+ "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.10.tgz";,
+ "integrity":
"sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ=="
},
"agent-base": {
"version": "4.3.0",
@@ -2826,9 +2826,9 @@
"integrity":
"sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
},
"deep-is": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";,
- "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz";,
+ "integrity":
"sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
"dev": true
},
"delayed-stream": {
@@ -3171,9 +3171,9 @@
"dev": true
},
"is2": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.6.tgz";,
- "integrity":
"sha512-+Z62OHOjA6k2sUDOKXoZI3EXv7Fb1K52jpTBLbkfx62bcUeSsrTBLhEquCRDKTx0XE5XbHcG/S2vrtE3lnEDsQ==",
+ "version": "2.0.9",
+ "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz";,
+ "integrity":
"sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==",
"dev": true,
"requires": {
"deep-is": "^0.1.3",
@@ -3810,14 +3810,13 @@
"integrity":
"sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
},
"selenium-webdriver": {
- "version": "4.0.0-beta.2",
- "resolved":
"https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.0.0-beta.2.tgz";,
- "integrity":
"sha512-uuNl3T1JjhrXCO4UAAy+iIIgZ/PqgYNiYvy+yfWCY+x2vHH9y7tIdD9a/q1rwbf/5jD/ENwYlVuNj46uIngknA==",
+ "version": "4.12.0",
+ "resolved":
"https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.12.0.tgz";,
+ "integrity":
"sha512-zvPzmTsky6WfO6+BGMj2mCJsw7qKnfQONur2b+pGn8jeTiC+WAUOthZOnaK+HkX5wiU6L4uoMF+JIcOVstp25A==",
"requires": {
- "jszip": "^3.5.0",
- "rimraf": "^2.7.1",
+ "jszip": "^3.10.1",
"tmp": "^0.2.1",
- "ws": "^7.3.1"
+ "ws": ">=8.13.0"
}
},
"semver": {
@@ -4075,11 +4074,11 @@
}
},
"webdriver-manager": {
- "version": "12.1.8",
- "resolved":
"https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.8.tgz";,
- "integrity":
"sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==",
+ "version": "12.1.9",
+ "resolved":
"https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.9.tgz";,
+ "integrity":
"sha512-Yl113uKm8z4m/KMUVWHq1Sjtla2uxEBtx2Ue3AmIlnlPAKloDn/Lvmy6pqWCUersVISpdMeVpAaGbNnvMuT2LQ==",
"requires": {
- "adm-zip": "^0.4.9",
+ "adm-zip": "^0.5.2",
"chalk": "^1.1.1",
"del": "^2.2.0",
"glob": "^7.0.3",
@@ -4201,9 +4200,9 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"ws": {
- "version": "7.5.7",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz";,
- "integrity":
"sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
+ "version": "8.14.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.0.tgz";,
+ "integrity":
"sha512-WR0RJE9Ehsio6U4TuM+LmunEsjQ5ncHlw4sn9ihD6RoJKZrVyH9FWV3dmnwu8B2aNib1OvG2X6adUCyFpQyWcg==",
"requires": {}
},
"xlsx": {
diff --git a/traffic_portal/test/integration/package.json
b/traffic_portal/test/integration/package.json
index a2e2ddac0d..15adcb06d8 100644
--- a/traffic_portal/test/integration/package.json
+++ b/traffic_portal/test/integration/package.json
@@ -17,7 +17,8 @@
"protractor-beautiful-reporter": "^1.3.6",
"protractor-html-reporter-2": "^1.0.4",
"random-ipv6": "^1.0.2",
- "selenium-webdriver": "^4.0.0-alpha.8",
+ "selenium-webdriver": "^4.12.0",
+ "webdriver-manager": "^12.1.9",
"xlsx": "^0.17.0"
},
"devDependencies": {
