From 0178dc9cbafe04905765e59dede7156c01c3ce11 Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 14:09:45 -0600 Subject: [PATCH 1/7] Dont start riak --- .github/actions/to-integration-tests/cdn.json | 14 ++++++ .../to-integration-tests/entrypoint.sh | 46 +---------------- .../actions/to-integration-tests/riak.json | 8 --- .github/actions/tp-integration-tests/cdn.json | 14 ++++++ .../tp-integration-tests/entrypoint.sh | 43 +--------------- .github/actions/tvdb-init/Dockerfile | 31 ++++++++++++ .github/actions/tvdb-init/README.md | 50 +++++++++++++++++++ .github/actions/tvdb-init/action.yml | 22 ++++++++ .github/actions/tvdb-init/dbconf.yml | 23 +++++++++ .github/actions/tvdb-init/entrypoint.sh | 47 +++++++++++++++++ .github/workflows/traffic-ops.yml | 5 ++ 11 files changed, 209 insertions(+), 94 deletions(-) delete mode 100644 .github/actions/to-integration-tests/riak.json create mode 100644 .github/actions/tvdb-init/Dockerfile create mode 100644 .github/actions/tvdb-init/README.md create mode 100644 .github/actions/tvdb-init/action.yml create mode 100644 .github/actions/tvdb-init/dbconf.yml create mode 100755 .github/actions/tvdb-init/entrypoint.sh diff --git a/.github/actions/to-integration-tests/cdn.json b/.github/actions/to-integration-tests/cdn.json index a08fbdfc14..eab18e0ece 100644 --- a/.github/actions/to-integration-tests/cdn.json +++ b/.github/actions/to-integration-tests/cdn.json @@ -22,6 +22,20 @@ "max_db_connections": 20, "db_conn_max_lifetime_seconds": 60, "db_query_timeout_seconds": 20, + "traffic_vault_backend": "postgres", + "traffic_vault_config": { + "dbname": "traffic_vault", + "hostname": "localhost", + "user": "traffic_vault", + "password": "twelve", + "port": 5432, + "ssl": false, + "conn_max_lifetime_seconds": 60, + "max_connections": 500, + "max_idle_connections": 30, + "query_timeout_seconds": 10, + "aes_key_location": "/aes.key" + }, "supported_ds_metrics": [ "kbps", "tps_total", "tps_2xx", "tps_3xx", "tps_4xx", "tps_5xx" ] }, "cors": { diff --git a/.github/actions/to-integration-tests/entrypoint.sh b/.github/actions/to-integration-tests/entrypoint.sh index f8eb7603a8..bf8ad39a0f 100755 --- a/.github/actions/to-integration-tests/entrypoint.sh +++ b/.github/actions/to-integration-tests/entrypoint.sh @@ -30,48 +30,7 @@ color_and_prefix() { } ciab_dir="${GITHUB_WORKSPACE}/infrastructure/cdn-in-a-box"; -trafficvault=trafficvault; -start_traffic_vault() { - <<-'/ETC/HOSTS' sudo tee --append /etc/hosts - 172.17.0.1 trafficvault.infra.ciab.test - /ETC/HOSTS - - <<-'BASH_LINES' cat >infrastructure/cdn-in-a-box/traffic_vault/prestart.d/00-0-standalone-config.sh; - TV_FQDN="${TV_HOST}.${INFRA_SUBDOMAIN}.${TLD_DOMAIN}" # Also used in 02-add-search-schema.sh - certs_dir=/etc/ssl/certs; - X509_INFRA_CERT_FILE="${certs_dir}/trafficvault.crt"; - X509_INFRA_KEY_FILE="${certs_dir}/trafficvault.key"; - - # Generate x509 certificate - openssl req -new -x509 -nodes -newkey rsa:4096 -out "$X509_INFRA_CERT_FILE" -keyout "$X509_INFRA_KEY_FILE" -subj "/CN=${TV_FQDN}"; - - # Do not wait for CDN in a Box to generate SSL keys - sed -i '0,/^update-ca-certificates/d' /etc/riak/prestart.d/00-config.sh; - - # Do not try to source to-access.sh - sed -i '/to-access\.sh\|^to-enroll/d' /etc/riak/{prestart.d,poststart.d}/* - BASH_LINES - - DOCKER_BUILDKIT=1 docker build "$ciab_dir" -f "${ciab_dir}/traffic_vault/Dockerfile" -t "$trafficvault" 2>&1 | - color_and_prefix "$gray_bg" "building Traffic Vault"; - if [[ -n "$(docker ps -qf "name=^${trafficvault}")" ]]; then - echo 'Traffic Vault is already running.' - return; - fi; - echo 'Starting Traffic Vault...'; - docker run \ - --detach \ - --env-file="${ciab_dir}/variables.env" \ - --hostname="${trafficvault}.infra.ciab.test" \ - --name="$trafficvault" \ - --publish=8087:8087 \ - --rm \ - "$trafficvault" \ - /usr/lib/riak/riak-cluster.sh; - docker logs -f "$trafficvault" 2>&1 >"${ciab_dir}/traffic.vault.logs"; -} -truncate -s0 "${ciab_dir}/traffic.vault.logs"; -start_traffic_vault & disown +openssl rand 32 | base64 | sudo tee /aes.key sudo apt-get install -y --no-install-recommends gettext @@ -151,10 +110,9 @@ envsubst <"${resources}/cdn.json" >cdn.conf cp "${resources}/database.json" database.conf export $(<"${ciab_dir}/variables.env" sed '/^#/d') # defines TV_ADMIN_USER/PASSWORD -envsubst <"${resources}/riak.json" >riak.conf truncate --size=0 traffic.ops.log # Removes output from previous API versions and makes sure files exist -./traffic_ops_golang --cfg ./cdn.conf --dbcfg ./database.conf -riakcfg riak.conf & +./traffic_ops_golang --cfg ./cdn.conf --dbcfg ./database.conf & cd "../testing/api/v$INPUT_VERSION" diff --git a/.github/actions/to-integration-tests/riak.json b/.github/actions/to-integration-tests/riak.json deleted file mode 100644 index b13cd05d8d..0000000000 --- a/.github/actions/to-integration-tests/riak.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user": "${TV_RIAK_USER}", - "password": "${TV_RIAK_PASSWORD}", - "MaxTLSVersion": "1.1", - "tlsConfig": { - "insecureSkipVerify": true - } -} diff --git a/.github/actions/tp-integration-tests/cdn.json b/.github/actions/tp-integration-tests/cdn.json index 6bd2b68409..d05fc4f849 100644 --- a/.github/actions/tp-integration-tests/cdn.json +++ b/.github/actions/tp-integration-tests/cdn.json @@ -22,6 +22,20 @@ "max_db_connections": 20, "db_conn_max_lifetime_seconds": 60, "db_query_timeout_seconds": 20, + "traffic_vault_backend": "postgres", + "traffic_vault_config": { + "dbname": "traffic_vault", + "hostname": "localhost", + "user": "traffic_vault", + "password": "twelve", + "port": 5432, + "ssl": false, + "conn_max_lifetime_seconds": 60, + "max_connections": 500, + "max_idle_connections": 30, + "query_timeout_seconds": 10, + "aes_key_location": "/aes.key" + }, "supported_ds_metrics": [ "kbps", "tps_total", "tps_2xx", "tps_3xx", "tps_4xx", "tps_5xx" ] }, "cors": { diff --git a/.github/actions/tp-integration-tests/entrypoint.sh b/.github/actions/tp-integration-tests/entrypoint.sh index f2c02205ae..c0a7532abd 100755 --- a/.github/actions/tp-integration-tests/entrypoint.sh +++ b/.github/actions/tp-integration-tests/entrypoint.sh @@ -21,13 +21,6 @@ onFail() { if ! [[ -d Reports ]]; then mkdir Reports; fi - if [[ -f tv.log ]]; then - cp tv.log Reports/traffic_vault.docker.log; - fi - docker logs "$trafficvault" > Reports/traffic_vault.log 2>&1; - if [[ -f tp.log ]]; then - mv tp.log Reports/forever.log - fi if [[ -f access.log ]]; then mv access.log Reports/tp-access.log fi @@ -110,41 +103,7 @@ QUERY sudo useradd trafops ciab_dir="${GITHUB_WORKSPACE}/infrastructure/cdn-in-a-box"; -trafficvault=trafficvault; -start_traffic_vault() { - <<-'/ETC/HOSTS' sudo tee --append /etc/hosts - 172.17.0.1 trafficvault.infra.ciab.test - /ETC/HOSTS - - <<-'BASH_LINES' cat >infrastructure/cdn-in-a-box/traffic_vault/prestart.d/00-0-standalone-config.sh; - TV_FQDN="${TV_HOST}.${INFRA_SUBDOMAIN}.${TLD_DOMAIN}" # Also used in 02-add-search-schema.sh - certs_dir=/etc/ssl/certs; - X509_INFRA_CERT_FILE="${certs_dir}/trafficvault.crt"; - X509_INFRA_KEY_FILE="${certs_dir}/trafficvault.key"; - - # Generate x509 certificate - openssl req -new -x509 -nodes -newkey rsa:4096 -out "$X509_INFRA_CERT_FILE" -keyout "$X509_INFRA_KEY_FILE" -subj "/CN=${TV_FQDN}"; - - # Do not wait for CDN in a Box to generate SSL keys - sed -i '0,/^update-ca-certificates/d' /etc/riak/prestart.d/00-config.sh; - - # Do not try to source to-access.sh - sed -i '/to-access\.sh\|^to-enroll/d' /etc/riak/{prestart.d,poststart.d}/* - BASH_LINES - - DOCKER_BUILDKIT=1 docker build "$ciab_dir" -f "${ciab_dir}/traffic_vault/Dockerfile" -t "$trafficvault" >/dev/null - echo 'Starting Traffic Vault...'; - docker run \ - --detach \ - --env-file="${ciab_dir}/variables.env" \ - --hostname="${trafficvault}.infra.ciab.test" \ - --name="$trafficvault" \ - --publish=8087:8087 \ - --rm \ - "$trafficvault" \ - /usr/lib/riak/riak-cluster.sh -} -start_traffic_vault >tv.log 2>&1 & +openssl rand 32 | base64 | sudo tee /aes.key sudo apt-get install -y --no-install-recommends gettext \ ruby ruby-dev libc-dev curl \ diff --git a/.github/actions/tvdb-init/Dockerfile b/.github/actions/tvdb-init/Dockerfile new file mode 100644 index 0000000000..b73aedf451 --- /dev/null +++ b/.github/actions/tvdb-init/Dockerfile @@ -0,0 +1,31 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# alpine:3.13 +FROM alpine@sha256:08d6ca16c60fe7490c03d10dc339d9fd8ea67c6466dea8d558526b1330a85930 + +RUN architecture=$(uname -m) && \ + mkdir lib64 && \ + # Use musl libc where the go binary expects glibc + # Less-generalized: ln -s /lib/ld-musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2 + ln -s /lib/ld-musl-${architecture}.so.[0-9] /lib64/ld-linux-${architecture//_/-}.so.2 +ENV GOROOT=/usr/local/go \ + CGO_ENABLED=0 + +COPY entrypoint.sh dbconf.yml / + +ENTRYPOINT /entrypoint.sh diff --git a/.github/actions/tvdb-init/README.md b/.github/actions/tvdb-init/README.md new file mode 100644 index 0000000000..e446d39470 --- /dev/null +++ b/.github/actions/tvdb-init/README.md @@ -0,0 +1,50 @@ + + +# tvdb-init Docker action +This action initializes a Traffic Vault database in a locally running PostgresQL +instance. It creates the `traffic_vault` user and database. + +## Outputs + +### `exit-code` +1 if the database initialized successfully.$^ + +## Example usage +```yaml +jobs: + tests: + runs-on: ubuntu-latest + + services: + postgres: + image: postgres:11.9 + env: + POSTGRES_USER: traffic_ops + POSTGRES_PASSWORD: twelve + POSTGRES_DB: traaffic_ops + ports: + - 5432:5432 + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + + steps: + - name: Checkout + uses: actions/checkout@master + - name: ./.github/actions/tvdb-init +``` diff --git a/.github/actions/tvdb-init/action.yml b/.github/actions/tvdb-init/action.yml new file mode 100644 index 0000000000..6b02e83d10 --- /dev/null +++ b/.github/actions/tvdb-init/action.yml @@ -0,0 +1,22 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +name: 'tvdb-init' +description: 'Initializes a Traffic Vault database using a local PostgreSQL instance' +runs: + using: 'docker' + image: 'Dockerfile' diff --git a/.github/actions/tvdb-init/dbconf.yml b/.github/actions/tvdb-init/dbconf.yml new file mode 100644 index 0000000000..7b8d04298e --- /dev/null +++ b/.github/actions/tvdb-init/dbconf.yml @@ -0,0 +1,23 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +version: "1.0" +name: dbconf.yml + +test: + driver: postgres + open: host=postgres port=5432 user=traffic_vault password=twelve dbname=traffic_vault sslmode=disable + diff --git a/.github/actions/tvdb-init/entrypoint.sh b/.github/actions/tvdb-init/entrypoint.sh new file mode 100755 index 0000000000..ee0b026042 --- /dev/null +++ b/.github/actions/tvdb-init/entrypoint.sh @@ -0,0 +1,47 @@ +#!/bin/sh -l +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +set -e + +download_go() { + go_version="$(cat "${GITHUB_WORKSPACE}/GO_VERSION")" + wget -O go.tar.gz "https://dl.google.com/go/go${go_version}.linux-amd64.tar.gz" + tar -C /usr/local -xzf go.tar.gz + rm go.tar.gz + export PATH="${PATH}:${GOROOT}/bin" + go version +} +download_go + +if ! [ -d "${GITHUB_WORKSPACE}/vendor/golang.org" ]; then + go mod vendor +fi + +apk add --no-cache postgresql-client + +cd traffic_ops/app + +mv /dbconf.yml db/trafficvault + +psql -d postgresql://traffic_ops:twelve@postgres:5432 <<- SQL + CREATE DATABASE traffic_vault; + CREATE USER traffic_vault WITH ENCRYPTED PASSWORD 'twelve'; + GRANT ALL PRIVILEGES ON DATABASE traffic_vault to traffic_vault; +SQL +psql -d postgresql://traffic_vault:twelve@postgres:5432/traffic_vault < db/trafficvault/create_tables.sql >/dev/null +go run ./db --env=test --trafficvault migrate diff --git a/.github/workflows/traffic-ops.yml b/.github/workflows/traffic-ops.yml index b13599ba57..6114aebc41 100644 --- a/.github/workflows/traffic-ops.yml +++ b/.github/workflows/traffic-ops.yml @@ -25,6 +25,7 @@ on: push: paths: - .github/actions/todb-init/** + - .github/actions/tvdb-init/** - .github/actions/to-integration-tests/** - .github/workflows/traffic-ops.yml - go.mod @@ -40,6 +41,7 @@ on: pull_request: paths: - .github/actions/todb-init/** + - .github/actions/tvdb-init/** - .github/actions/to-integration-tests/** - .github/workflows/traffic-ops.yml - go.mod @@ -97,6 +99,9 @@ jobs: - name: Initialize Traffic Ops Database id: todb uses: ./.github/actions/todb-init + - name: Initialize Traffic Vault Database + id: tvdb + uses: ./.github/actions/tvdb-init - name: Check Go Version run: echo "::set-output name=value::$(cat GO_VERSION)" id: go-version From 5c5b2cc8b8714ec580250423c661f1f1eaacd229 Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 17:16:37 -0600 Subject: [PATCH 2/7] Remove riak.json --- .github/actions/tp-integration-tests/riak.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .github/actions/tp-integration-tests/riak.json diff --git a/.github/actions/tp-integration-tests/riak.json b/.github/actions/tp-integration-tests/riak.json deleted file mode 100644 index b13cd05d8d..0000000000 --- a/.github/actions/tp-integration-tests/riak.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "user": "${TV_RIAK_USER}", - "password": "${TV_RIAK_PASSWORD}", - "MaxTLSVersion": "1.1", - "tlsConfig": { - "insecureSkipVerify": true - } -} From 6ed132778aec908c793fa74e8c0453328fc93726 Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 17:18:17 -0600 Subject: [PATCH 3/7] Forgot to remove riak.json --- .github/actions/tp-integration-tests/entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/tp-integration-tests/entrypoint.sh b/.github/actions/tp-integration-tests/entrypoint.sh index c0a7532abd..52458c51e6 100755 --- a/.github/actions/tp-integration-tests/entrypoint.sh +++ b/.github/actions/tp-integration-tests/entrypoint.sh @@ -21,6 +21,9 @@ onFail() { if ! [[ -d Reports ]]; then mkdir Reports; fi + if [[ -f tp.log ]]; then + mv tp.log Reports/forever.log + fi if [[ -f access.log ]]; then mv access.log Reports/tp-access.log fi From ce79ba4af7d777c3c25185007016a1a2c9ea1bb3 Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 17:32:24 -0600 Subject: [PATCH 4/7] More TP cleanup --- .github/actions/tp-integration-tests/entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/tp-integration-tests/entrypoint.sh b/.github/actions/tp-integration-tests/entrypoint.sh index 52458c51e6..553e481d04 100755 --- a/.github/actions/tp-integration-tests/entrypoint.sh +++ b/.github/actions/tp-integration-tests/entrypoint.sh @@ -143,10 +143,9 @@ to_build() { cp "${resources}/database.json" database.conf export $(<"${ciab_dir}/variables.env" sed '/^#/d') # defines TV_ADMIN_USER/PASSWORD - envsubst <"${resources}/riak.json" >riak.conf truncate -s0 out.log - ./traffic_ops_golang --cfg ./cdn.conf --dbcfg ./database.conf -riakcfg riak.conf >out.log 2>&1 & + ./traffic_ops_golang --cfg ./cdn.conf --dbcfg ./database.conf >out.log 2>&1 & popd } From 25dee7bb80f01ad0219ff1be11999877cfc6cf3e Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 17:49:04 -0600 Subject: [PATCH 5/7] Forgot more TP --- .github/workflows/tp.integration.tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/tp.integration.tests.yml b/.github/workflows/tp.integration.tests.yml index 206c293b93..4958a180a8 100644 --- a/.github/workflows/tp.integration.tests.yml +++ b/.github/workflows/tp.integration.tests.yml @@ -25,6 +25,7 @@ on: push: paths: - .github/actions/todb-init/** + - .github/actions/tvdb-init/** - .github/actions/tp-integration-tests/** - .github/workflows/tp.integration.tests.yml - GO_VERSION @@ -37,6 +38,7 @@ on: pull_request: paths: - .github/actions/todb-init/** + - .github/actions/tvdb-init/** - .github/actions/tp-integration-tests/** - .github/workflows/tp.integration.tests.yml - GO_VERSION @@ -107,6 +109,9 @@ jobs: - name: Initialize Traffic Ops Database id: todb uses: ./.github/actions/todb-init + - name: Initialize Traffic Vault Database + id: tvdb + uses: ./.github/actions/tvdb-init - name: Check Go Version run: echo "::set-output name=value::$(cat GO_VERSION)" id: go-version From 67904798c8f01dce7d913e1f23b078fa32f7172a Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 17:51:25 -0600 Subject: [PATCH 6/7] Fix typo --- .github/actions/tvdb-init/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/tvdb-init/README.md b/.github/actions/tvdb-init/README.md index e446d39470..cbf11f7a56 100644 --- a/.github/actions/tvdb-init/README.md +++ b/.github/actions/tvdb-init/README.md @@ -24,7 +24,7 @@ instance. It creates the `traffic_vault` user and database. ## Outputs ### `exit-code` -1 if the database initialized successfully.$^ +1 if the database initialized successfully. ## Example usage ```yaml From af53deab5355271b1539ee2f1775df7ab37f15ca Mon Sep 17 00:00:00 2001 From: shamrickus Date: Thu, 9 Sep 2021 19:13:06 -0600 Subject: [PATCH 7/7] Remove more references to riak --- .../actions/to-integration-tests/.gitignore | 1 - .../actions/to-integration-tests/README.md | 1 - .../actions/tp-integration-tests/README.md | 1 - .../tp-integration-tests/entrypoint.sh | 32 ------------------- 4 files changed, 35 deletions(-) diff --git a/.github/actions/to-integration-tests/.gitignore b/.github/actions/to-integration-tests/.gitignore index 8d669e0ef5..8f9f7406af 100644 --- a/.github/actions/to-integration-tests/.gitignore +++ b/.github/actions/to-integration-tests/.gitignore @@ -21,5 +21,4 @@ database.conf error.log localhost.crt localhost.key -riak.conf warning.log diff --git a/.github/actions/to-integration-tests/README.md b/.github/actions/to-integration-tests/README.md index 324e9b6242..6c729e3410 100644 --- a/.github/actions/to-integration-tests/README.md +++ b/.github/actions/to-integration-tests/README.md @@ -20,7 +20,6 @@ # to-integration-tests JavaScript action This action runs the Traffic Ops Go client integration tests with the Traffic Ops API. - Requires an SMTP service (see `smtp_address` input) -- Provides a Riak server at address `trafficvault.infra.ciab.test` ## Inputs diff --git a/.github/actions/tp-integration-tests/README.md b/.github/actions/tp-integration-tests/README.md index 72305786b2..4829031d3e 100644 --- a/.github/actions/tp-integration-tests/README.md +++ b/.github/actions/tp-integration-tests/README.md @@ -20,7 +20,6 @@ # tp-integration-tests javascript action this action runs the traffic portal integration tests - requires an smtp service (see `smtp_address` input) -- provides a riak server at address `trafficvault.infra.ciab.test` ## inputs diff --git a/.github/actions/tp-integration-tests/entrypoint.sh b/.github/actions/tp-integration-tests/entrypoint.sh index 553e481d04..94398700cf 100755 --- a/.github/actions/tp-integration-tests/entrypoint.sh +++ b/.github/actions/tp-integration-tests/entrypoint.sh @@ -57,13 +57,6 @@ export PGHOST="localhost" export PGDATABASE="traffic_ops" export PGPORT="5432" -# For TV Setup -DIVISION="adivision" -REGION="aregion" -PHYS="aloc" -COORD="acoord" -CDN="zcdn" -CG="acg" to_admin_username="$(jq -r '.params.login.username' "${GITHUB_WORKSPACE}/traffic_portal/test/integration/config.json")" to_admin_password="$(jq -r '.params.login.password' "${GITHUB_WORKSPACE}/traffic_portal/test/integration/config.json")" password_hash="$(<