Merge pull request #152 from noi-techpark/main

main
noi-techpark · Sep 8, 2022 · 267bb1e · 267bb1e
2 parents 0a077c7 + 78d06bc
commit 267bb1e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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")
@@ -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

diff --git 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")