From 7105582a2ac253d9ce6933164cdc904381628317 Mon Sep 17 00:00:00 2001 From: RudiThoeni Date: Thu, 8 Sep 2022 16:19:41 +0200 Subject: [PATCH 1/2] reverting gtfs url change --- docker-compose.yml | 5 ++--- infrastructure/Jenkinsfile-Prod-Execute.groovy | 2 +- infrastructure/Jenkinsfile-Test-Execute.groovy | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8e5ea7af..c62674f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -135,7 +135,7 @@ services: - BUILD_GRAPH=False - OTP_OFFICIAL=False - GTFS_FILE=latestGTFS.zip - - GTFS_URL=ftp://ftp.sta.bz.it/gtfs/google_transit.zip + - GTFS_URL=ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip - GTFS_URL_UPDATETIME=0 * * * * - GTFS_URL_UPDATEHOOK='' volumes: @@ -174,5 +174,4 @@ services: volumes: - /opt/odh-mentor-otp/:/data/ #- infrastructure/docker/docker-entrypoint.sh:/docker-entrypoint.sh - #uncomment to test script - restart: "no" + #uncomment to test script diff --git a/infrastructure/Jenkinsfile-Prod-Execute.groovy b/infrastructure/Jenkinsfile-Prod-Execute.groovy index 463632fd..be902def 100644 --- a/infrastructure/Jenkinsfile-Prod-Execute.groovy +++ b/infrastructure/Jenkinsfile-Prod-Execute.groovy @@ -55,7 +55,7 @@ pipeline { DRT_HOST="https://drt.otp.opendatahub.bz.it/" CHARGER_HOST="https://charger.otp.opendatahub.bz.it/" - GTFS_URL="ftp://ftp.sta.bz.it/gtfs/google_transit.zip" + GTFS_URL="ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip" GTFS_URL_UPDATETIME="0 4 * * *" GTFS_URL_UPDATEHOOK="https://jenkins.testingmachine.eu/job/it.bz.opendatahub.otp/job/calculate.prod-deploy.trigger/build?token=" JENKINSURL_TOKEN=credentials("calculate.test-deploy.trigger-authtoken") diff --git a/infrastructure/Jenkinsfile-Test-Execute.groovy b/infrastructure/Jenkinsfile-Test-Execute.groovy index 502d2a61..0055fcd4 100644 --- a/infrastructure/Jenkinsfile-Test-Execute.groovy +++ b/infrastructure/Jenkinsfile-Test-Execute.groovy @@ -54,7 +54,7 @@ pipeline { DRT_HOST="https://drt.otp.opendatahub.testingmachine.eu/" CHARGER_HOST="https://charger.otp.opendatahub.testingmachine.eu/" - GTFS_URL="ftp://ftp.sta.bz.it/gtfs/google_transit.zip" + GTFS_URL="ftp://ftp.sta.bz.it/gtfs/google_transit_shp.zip" GTFS_URL_UPDATETIME="0 2 * * *" GTFS_URL_UPDATEHOOK="https://jenkins.testingmachine.eu/job/it.bz.opendatahub.otp/job/calculate.test-deploy.trigger/build?token=" JENKINSURL_TOKEN=credentials("calculate.test-deploy.trigger-authtoken") From 78d06bc860bc287a479f7938770c1339b2672346 Mon Sep 17 00:00:00 2001 From: RudiThoeni <30471361+RudiThoeni@users.noreply.github.com> Date: Thu, 8 Sep 2022 17:04:39 +0200 Subject: [PATCH 2/2] fix --- infrastructure/Jenkinsfile-Prod-Execute.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/Jenkinsfile-Prod-Execute.groovy b/infrastructure/Jenkinsfile-Prod-Execute.groovy index be902def..4f4523b3 100644 --- a/infrastructure/Jenkinsfile-Prod-Execute.groovy +++ b/infrastructure/Jenkinsfile-Prod-Execute.groovy @@ -71,7 +71,7 @@ pipeline { steps { sh """ rm -f .env - cp .env.example .env + cp dotenv.example .env echo 'COMPOSE_PROJECT_NAME=${DOCKER_PROJECT_NAME}' > .env echo 'DOCKER_IMAGE_OTP=${DOCKER_IMAGE_OTP}' >> .env echo 'DOCKER_IMAGE_JOURNEY=${DOCKER_IMAGE_JOURNEY}' >> .env