This is an automated email from the ASF dual-hosted git repository. rshah pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 57af39d4aa71aeaa1d997df516c38516619a4bec Author: Zach Hoffman <[email protected]> AuthorDate: Wed Oct 4 09:00:32 2023 -0600 Re-add removed parenthesis (#7828) (cherry picked from commit f96f030c632e091fbe95051fb8bf60dd5540019e) --- .github/workflows/tr-ultimate-test-harness.yml | 2 ++ dev/traffic_ops/run.sh | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tr-ultimate-test-harness.yml b/.github/workflows/tr-ultimate-test-harness.yml index 3a106a17b7..5dbb842193 100644 --- a/.github/workflows/tr-ultimate-test-harness.yml +++ b/.github/workflows/tr-ultimate-test-harness.yml @@ -26,6 +26,7 @@ on: paths: - .github/actions/tr-ultimate-test-harness/** - .github/workflows/tr-ultimate-test-harness.yml + - dev/traffic_ops/** - dev/traffic_router/** - traffic_router/** create: @@ -33,6 +34,7 @@ on: paths: - .github/actions/tr-ultimate-test-harness/** - .github/workflows/tr-ultimate-test-harness.yml + - dev/traffic_ops/** - dev/traffic_router/** - traffic_router/** types: [ opened, reopened, ready_for_review, synchronize ] diff --git a/dev/traffic_ops/run.sh b/dev/traffic_ops/run.sh index 152d98b3e1..dea6a4f7f0 100755 --- a/dev/traffic_ops/run.sh +++ b/dev/traffic_ops/run.sh @@ -28,13 +28,16 @@ db_init() { cd "$TC" make traffic_ops/app/db/admin - (cd "$TC/dev/traffic_ops" + ( + cd "$TC/dev/traffic_ops" + "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" reset + "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" upgrade + "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" seed + "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" reset + "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" upgrade - "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" reset - "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" upgrade - "$ADMIN" -c ./dbconf.yml -s "$TC/traffic_ops/app/db/create_tables.sql" -S "$TC/traffic_ops/app/db/seeds.sql" -p "$TC/traffic_ops/app/db/patches.sql" -m "$TC/traffic_ops/app/db/migrations" seed - "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" reset - "$ADMIN" -v -c ./traffic.vault.dbconf.yml -s "$TC/traffic_ops/app/db/trafficvault/create_tables.sql" -m "$TC/traffic_ops/app/db/trafficvault/migrations" upgrade + psql -d 'postgres://traffic_ops:twelve12@db:5432/traffic_ops_development?sslmode=disable' -f ./seed.psql + ) } user=trafficops
