From c5977908fc8cc2f711999af0dece7fa770546d7c Mon Sep 17 00:00:00 2001 From: Robert Bendun Date: Wed, 22 Mar 2023 15:17:22 +0100 Subject: [PATCH] limit for jenkins --- Jenkinsfile | 26 ++++---------------------- prepare-ztm-data.sh | 29 ++++++++++++++++++----------- stats.py | 1 - 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae25176..22b385e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,26 +1,8 @@ node { - stage('Preparation') { - properties([ - parameters([ - string( - defaultValue: 'Hello World!', - description: 'Tekst do wyświetlenie', - name: 'INPUT_TEXT', - trim: false - ) - ]) - ]) - } - stage('Hello') { - //Wypisz wartość parametru w konsoli (To nie jest polecenie bash, tylko groovy!) - echo "INPUT_TEXT: ${INPUT_TEXT}" - //Wywołaj w konsoli komendę "figlet", która generuje ASCI-art - sh "figlet \"${INPUT_TEXT}\" | tee output.txt" - } - stage('Goodbye') { - echo 'Goodbye!' - //Zarchiwizuj wynik - archiveArtifacts 'output.txt' + stage('Build') { + checkout([$class: 'GitSCM', branches: [[name: 'ztm']], extensions: [], userRemoteConfigs: [[url: 'https://git.wmi.amu.edu.pl/s452639/ium_452639']]]) + sh './prepare-ztm-data.sh' + archiveArtifacts artifacts: 'stop_times.csv', followSymlinks: false } } diff --git a/prepare-ztm-data.sh b/prepare-ztm-data.sh index c6d6142..ec26907 100755 --- a/prepare-ztm-data.sh +++ b/prepare-ztm-data.sh @@ -2,7 +2,8 @@ set -xe -o pipefail -make normalize csv2tsv/csv2tsv +# Disable to allow to work in bare jenkins +# make normalize csv2tsv/csv2tsv keep=(stops.txt trips.txt stop_times.txt) @@ -22,15 +23,21 @@ cd .. for k in "${keep[@]}"; do csv="${k%.txt}.csv" - tsv="${k%.txt}.tsv" - if [ ! -f "$tsv" ]; then - cat $(find data -name "$k") > "$csv" - csv2tsv/csv2tsv <"$csv" >"$tsv" - fi + cat $(find data -name "$k") > "$csv" done -if [ ! -f "stop_times.normalized.tsv" ]; then - ./normalize stop_times.normalized.tsv - ./split_train_valid_test.py -fi -./stats.py +# Disable to allow to work in bare jenkins +# for k in "${keep[@]}"; do +# csv="${k%.txt}.csv" +# tsv="${k%.txt}.tsv" +# if [ ! -f "$tsv" ]; then +# cat $(find data -name "$k") > "$csv" +# csv2tsv/csv2tsv <"$csv" >"$tsv" +# fi +# done +# +# if [ ! -f "stop_times.normalized.tsv" ]; then +# ./normalize stop_times.normalized.tsv +# ./split_train_valid_test.py +# fi +# ./stats.py diff --git a/stats.py b/stats.py index 0fbc094..f11f789 100755 --- a/stats.py +++ b/stats.py @@ -42,7 +42,6 @@ shgroup["departure_time"] = shgroup["departure_time"].map(float2time) print(shgroup) print() - print("--- Normalized data statistics -------------------------------") print(data.describe(include='all'))