You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by zr...@apache.org on 2021/01/04 20:28:00 UTC
[trafficcontrol] branch master updated: TP GHA cleanup (#5398)
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 1393a1c TP GHA cleanup (#5398)
1393a1c is described below
commit 1393a1cd0b5608a2c293918e302c973a332357d3
Author: Steve Hamrick <sh...@users.noreply.github.com>
AuthorDate: Mon Jan 4 13:27:48 2021 -0700
TP GHA cleanup (#5398)
* Use cat instead of tail
* Experiment with using default conf.json
* Modify existing conf.json
* Remove trailing slash
* Actually output on error
* Fix line size
* Remove conf.json
* dont fail when no error
* remove cat
* Actually show even log
---
.github/actions/tp-e2e-tests/conf.json | 37 ----------------------------
.github/actions/tp-e2e-tests/entrypoint.sh | 39 ++++++++++++++++++------------
2 files changed, 24 insertions(+), 52 deletions(-)
diff --git a/.github/actions/tp-e2e-tests/conf.json b/.github/actions/tp-e2e-tests/conf.json
deleted file mode 100644
index 6301c2d..0000000
--- a/.github/actions/tp-e2e-tests/conf.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "baseUrl": "https://localhost:8443",
- "capabilities": {
- "acceptInsecureCerts": true,
- "browserName": "chrome",
- "chromeOptions": {
- "args": ["--disable-extensions", "--disable-gpu", "--headless", "--no-sandbox", "--ignore-certificate-errors"]
- }
- },
- "framework": "jasmine",
- "getPageTimeout": 90000,
- "jasmineNodeOpts": {
- "defaultTimeoutInterval": 90000
- },
- "params": {
- "adminPassword": "twelve12",
- "adminUser": "admin"
- },
- "logLevel": "INFO",
- "suites": {
- "allTests": [
- "login/login-spec.js",
- "CDNs/cdns-spec.js",
- "cacheGroups/cache-groups-spec.js",
- "profiles/profiles-spec.js",
- "divisions/divisions-spec.js",
- "regions/regions-spec.js",
- "physLocations/phys-locations-spec.js",
- "serverCapabilities/server-capabilities-spec.js",
- "servers/servers-spec.js",
- "topologies/topologies-spec.js",
- "deliveryServices/delivery-services-spec.js",
- "jobs/jobs-spec.js",
- "tenants/tenants-spec.js"
- ]
- }
-}
diff --git a/.github/actions/tp-e2e-tests/entrypoint.sh b/.github/actions/tp-e2e-tests/entrypoint.sh
index f175782..d68a5ea 100755
--- a/.github/actions/tp-e2e-tests/entrypoint.sh
+++ b/.github/actions/tp-e2e-tests/entrypoint.sh
@@ -36,10 +36,14 @@ export PGDATABASE="traffic_ops"
export PGPORT="5432"
<<QUERY psql
-INSERT INTO tm_user (username, local_passwd, role, tenant_id) VALUES ('admin', 'SCRYPT:16384:8:1:vVw4X6mhoEMQXVGB/ENaXJEcF4Hdq34t5N8lapIjDQEAS4hChfMJMzwwmHfXByqUtjmMemapOPsDQXG+BAX/hA==:vORiLhCm1EtEQJULvPFteKbAX2DgxanPhHdrYN8VzhZBNF81NRxxpo7ig720KcrjH1XFO6BUTDAYTSBGU9KO3Q==', 1, 1);
+INSERT INTO tm_user (username, role, tenant_id, local_passwd)
+ VALUES ('admin', 1, 1,
+ 'SCRYPT:16384:8:1:vVw4X6mhoEMQXVGB/ENaXJEcF4Hdq34t5N8lapIjDQEAS4hChfMJMzwwmHfXByqUtjmMemapOPsDQXG+BAX/hA==:vORiLhCm1EtEQJULvPFteKbAX2DgxanPhHdrYN8VzhZBNF81NRxxpo7ig720KcrjH1XFO6BUTDAYTSBGU9KO3Q=='
+ );
INSERT INTO division(name) VALUES('${DIVISION}');
INSERT INTO region(name, division) VALUES('${REGION}', 1);
-INSERT INTO phys_location(name, short_name, region, address, city, state, zip) VALUES('${PHYS}', '${PHYS}', 1, 'some place idk', 'Denver', 'CO', '88888');
+INSERT INTO phys_location(name, short_name, region, address, city, state, zip)
+ VALUES('${PHYS}', '${PHYS}', 1, 'some place idk', 'Denver', 'CO', '88888');
INSERT INTO coordinate(name) VALUES('${COORD}');
INSERT INTO cdn(name, domain_name) VALUES('${CDN}', 'infra.ciab.test');
@@ -180,7 +184,7 @@ truncate --size=0 warning.log error.log event.log # Removes output from previous
./traffic_ops_golang --cfg ./cdn.conf --dbcfg ./database.conf -riakcfg riak.conf &
tail -f warning.log 2>&1 | color_and_prefix "${yellow_bg}" 'Traffic Ops' &
tail -f error.log 2>&1 | color_and_prefix "${red_bg}" 'Traffic Ops' &
-tail -f warning.log 2>&1 | color_and_prefix "${gray_bg}" 'Traffic Ops' &
+tail -f event.log 2>&1 | color_and_prefix "${gray_bg}" 'Traffic Ops' &
cd "../../traffic_portal"
npm ci
@@ -191,24 +195,29 @@ cp "${resources}/config.js" ./conf/
touch tp.log access.log
sudo forever --minUptime 5000 --spinSleepTime 2000 -l ./tp.log start server.js &
-fqdn="https://localhost:8443/"
-while ! curl -Lvsk "${fqdn}api/3.0/ping" >/dev/null 2>&1; do
+fqdn="https://localhost:8443"
+while ! curl -Lvsk "${fqdn}/api/3.0/ping" >/dev/null 2>&1; do
echo "waiting for TP/TO server to start on '${fqdn}'"
sleep 10
done
cd "test/end_to_end"
-cp "${resources}/conf.json" .
-
-sudo protractor ./conf.js
-CODE=$?
-
-if [ $CODE -ne 0 ]; then
+jq " .capabilities.chromeOptions.args = [
+ \"--disable-extensions\",
+ \"--disable-gpu\",
+ \"--headless\",
+ \"--no-sandbox\",
+ \"--ignore-certificate-errors\"
+ ] | .baseUrl = \"${fqdn}\" | del(.seleniumAddress)" \
+ conf.json > conf.json.tmp && mv conf.json.tmp conf.json
+
+onFail() {
docker logs "$trafficvault" 2>&1 |
color_and_prefix "$gray_bg" 'Traffic Vault';
- tail -f tp.log | color_and_prefix "${gray_bg}" 'Forever'
- tail -f access.log | color_and_prefix "${gray_bg}" 'Traffic Portal'
-fi
+ cat tp.log | color_and_prefix "${gray_bg}" 'Forever'
+ cat access.log | color_and_prefix "${gray_bg}" 'Traffic Portal'
+ exit 1
+}
-exit $CODE
+sudo protractor ./conf.js || onFail