From 32fad21bfa1515207f7d37c226296d2df70eaaf8 Mon Sep 17 00:00:00 2001 From: Sebas Date: Fri, 8 Nov 2019 12:40:13 +0100 Subject: [PATCH 1/6] Benchmark file in a Gist --- Jenkinsfile | 3 ++- tests/benchmarks/benchmark.sh | 22 ---------------------- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 tests/benchmarks/benchmark.sh diff --git a/Jenkinsfile b/Jenkinsfile index 63bf200d25..5434b0223a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,8 @@ pipeline { } stage ('Benchmark'){ steps { - sh 'bash tests/benchmarks/benchmark.sh >> reports/benchmarks.txt' + sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c' + sh 'bash benchmark.sh >> reports/benchmarks.txt' } } } diff --git a/tests/benchmarks/benchmark.sh b/tests/benchmarks/benchmark.sh deleted file mode 100644 index b0f3b53a7b..0000000000 --- a/tests/benchmarks/benchmark.sh +++ /dev/null @@ -1,22 +0,0 @@ -!/usr/bin/env bash - -echo "Benchmark report" -echo "--------------------" -i="0" -total=0 -while [ $i -lt 5 ] -do - start=`date +%s` - python setup.py test &> /dev/null - end=`date +%s` - runtime=$((end-start)) - total=$((total+runtime)) - i=$[$i+1] - echo " - Time spent job $i: $runtime second(s)" -done - -mean=$((total/5)) -echo "--------------------" -echo "Total time spent ($i jobs): $total second(s)" -echo "Time spent per job: $mean second(s)" -echo "--------------------" \ No newline at end of file From 30e39b8f01a424cb06030fc24b937c755ed47c31 Mon Sep 17 00:00:00 2001 From: Sebas Date: Fri, 8 Nov 2019 12:46:59 +0100 Subject: [PATCH 2/6] Fix path to the file --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5434b0223a..3f23d63aec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { } stage ('Benchmark'){ steps { - sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c' + sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c/raw/benchmark.sh' sh 'bash benchmark.sh >> reports/benchmarks.txt' } } From 3ee6dc18b91b977e992e94205ad2a42e90a94e79 Mon Sep 17 00:00:00 2001 From: Sebas Date: Fri, 8 Nov 2019 12:54:08 +0100 Subject: [PATCH 3/6] Change the link to the file --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f23d63aec..26fd2c3bae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { } stage ('Benchmark'){ steps { - sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c/raw/benchmark.sh' + sh 'curl -o benchmark.sh -s https://gist.githubusercontent.com/sebascm/c56b26bc24d8964c005cfae95c853e5c/raw/f4cfd88af7049acaff89d2ef68ae5d40f666ee46/benchmark.sh' sh 'bash benchmark.sh >> reports/benchmarks.txt' } } From ccedef78f579340209f05eac96f1ccbbcbcba2f1 Mon Sep 17 00:00:00 2001 From: Sebas Date: Fri, 8 Nov 2019 13:20:54 +0100 Subject: [PATCH 4/6] Indentation fix --- Jenkinsfile | 131 +++++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 57 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 26fd2c3bae..51dd7b4d98 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,63 +1,80 @@ pipeline { - agent { docker { image 'python' } } - stages { - stage('Setup Workspace') { - steps { - sh 'mkdir reports' - } - } - stage('Validate') { - steps { - sh 'pip install flake8' - sh 'flake8 > reports/flake8.txt' - sh 'flake8 --select=DUO > reports/dlint.txt' - } - } - stage('Tests') { - steps { - sh 'python setup.py test > reports/tests.txt' - } - } - stage('Package') { - steps { - sh 'python setup.py build' - } - } - stage('Verify') { - steps { - sh 'pip install bandit' - sh 'bandit -lll -s B303,B605,B602 -r . -o "reports/bandit.txt"' - } - } - stage('Deploy') { - steps { - sh 'tar -cvzf build.tar.gz build/' - } - } - stage ('Benchmark'){ - steps { - sh 'curl -o benchmark.sh -s https://gist.githubusercontent.com/sebascm/c56b26bc24d8964c005cfae95c853e5c/raw/f4cfd88af7049acaff89d2ef68ae5d40f666ee46/benchmark.sh' - sh 'bash benchmark.sh >> reports/benchmarks.txt' + agent { docker { image 'python' } } + stages { + stage('Setup Workspace') { + steps { + sh 'mkdir reports' + } + } + stage('Validate') { + steps { + sh 'pip install flake8' + sh 'flake8 > reports/flake8.txt' + sh 'flake8 --select=DUO > reports/dlint.txt' + } + } + stage('Tests') { + steps { + sh 'python setup.py test > reports/tests.txt' + } + } + stage('Package') { + steps { + sh 'python setup.py build' + } + } + stage('Verify') { + steps { + sh 'pip install bandit' + sh 'bandit -lll -s B303,B605,B602 -r . -o "reports/bandit.txt"' + } + } + stage('Deploy') { + steps { + sh 'tar -cvzf build.tar.gz build/' + } + } + stage ('Benchmark'){ + steps { + sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c' + sh 'bash benchmark.sh >> reports/benchmarks.txt' + } + } + } + post { + success{ + archiveArtifacts artifacts: 'build.tar.gz' + sh 'tar -cvzf reports.tar.gz reports/' + archiveArtifacts 'reports.tar.gz' + script{ + if (env.BRANCH_NAME.startsWith('PR')){ + withCredentials([usernamePassword(credentialsId: 'SebasGH', passwordVariable: 'pass', usernameVariable: 'user')]) { + sh "git config --global user.email 'sebastiancalvom@gmail.com'" + sh "git config --global user.name 'Sebas'" + sh "git remote update" + sh "git fetch --all" + sh "git pull --all" + sh "git checkout origin/dev" + sh "git merge origin/master" + sh "git merge ${BRANCH_NAME}" + sh "git push https://$user:$pass@github.com/sebascm/faker/ HEAD:origin/dev" } + } } } - post { - success{ - archiveArtifacts artifacts: 'build.tar.gz' - } - always { - sh 'tar -cvzf reports.tar.gz reports/' - archiveArtifacts 'reports.tar.gz' - emailext ( - attachmentsPattern: 'reports.tar.gz', - subject: "[JENKINS] Job '${env.JOB_NAME} execution result'", - from: 'notificaciones.torusnewies@gmail.com', - to: 'sebastiancalvom@gmail.com', - body: " Job: '${env.JOB_NAME} \n\tBuild: [${env.BUILD_NUMBER}] \n\tStatus: ${currentBuild.currentResult}" - ) - } - cleanup { - deleteDir() - } + always { + sh 'tar -cvzf reports.tar.gz reports/' + archiveArtifacts 'reports.tar.gz' + emailext ( + attachmentsPattern: 'reports.tar.gz', + subject: "[JENKINS] Job '${env.JOB_NAME} execution result'", + from: 'notificaciones.torusnewies@gmail.com', + to: 'sebastiancalvom@gmail.com', + body: " Job: '${env.JOB_NAME} \n\tBuild: [${env.BUILD_NUMBER}] \n\tStatus: ${currentBuild.currentResult}" + ) + } + cleanup { + cleanWs() } + } } From a7d3a38de676fb1efdf9d63365b1f2063194ebf5 Mon Sep 17 00:00:00 2001 From: Sebas Date: Fri, 8 Nov 2019 13:41:00 +0100 Subject: [PATCH 5/6] Fix indentation --- Jenkinsfile | 150 ++++++++++++++++++++++++++-------------------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 51dd7b4d98..abed1b9ca9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,80 +1,80 @@ pipeline { - agent { docker { image 'python' } } - stages { - stage('Setup Workspace') { - steps { - sh 'mkdir reports' - } - } - stage('Validate') { - steps { - sh 'pip install flake8' - sh 'flake8 > reports/flake8.txt' - sh 'flake8 --select=DUO > reports/dlint.txt' - } - } - stage('Tests') { - steps { - sh 'python setup.py test > reports/tests.txt' - } - } - stage('Package') { - steps { - sh 'python setup.py build' - } - } - stage('Verify') { - steps { - sh 'pip install bandit' - sh 'bandit -lll -s B303,B605,B602 -r . -o "reports/bandit.txt"' - } - } - stage('Deploy') { - steps { - sh 'tar -cvzf build.tar.gz build/' - } - } - stage ('Benchmark'){ - steps { - sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c' - sh 'bash benchmark.sh >> reports/benchmarks.txt' - } - } - } - post { - success{ - archiveArtifacts artifacts: 'build.tar.gz' - sh 'tar -cvzf reports.tar.gz reports/' - archiveArtifacts 'reports.tar.gz' - script{ - if (env.BRANCH_NAME.startsWith('PR')){ - withCredentials([usernamePassword(credentialsId: 'SebasGH', passwordVariable: 'pass', usernameVariable: 'user')]) { - sh "git config --global user.email 'sebastiancalvom@gmail.com'" - sh "git config --global user.name 'Sebas'" - sh "git remote update" - sh "git fetch --all" - sh "git pull --all" - sh "git checkout origin/dev" - sh "git merge origin/master" - sh "git merge ${BRANCH_NAME}" - sh "git push https://$user:$pass@github.com/sebascm/faker/ HEAD:origin/dev" + agent { docker { image 'python' } } + stages { + stage('Setup Workspace') { + steps { + sh 'mkdir reports' } - } + } + stage('Validate') { + steps { + sh 'pip install flake8' + sh 'flake8 > reports/flake8.txt' + sh 'flake8 --select=DUO > reports/dlint.txt' + } + } + stage('Tests') { + steps { + sh 'python setup.py test > reports/tests.txt' + } + } + stage('Package') { + steps { + sh 'python setup.py build' + } + } + stage('Verify') { + steps { + sh 'pip install bandit' + sh 'bandit -lll -s B303,B605,B602 -r . -o "reports/bandit.txt"' + } + } + stage('Deploy') { + steps { + sh 'tar -cvzf build.tar.gz build/' + } + } + stage ('Benchmark'){ + steps { + sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c' + sh 'bash benchmark.sh >> reports/benchmarks.txt' + } + } + } + post { + success{ + archiveArtifacts artifacts: 'build.tar.gz' + sh 'tar -cvzf reports.tar.gz reports/' + archiveArtifacts 'reports.tar.gz' + script{ + if (env.BRANCH_NAME.startsWith('PR')){ + withCredentials([usernamePassword(credentialsId: 'SebasGH', passwordVariable: 'pass', usernameVariable: 'user')]) { + sh "git config --global user.email 'sebastiancalvom@gmail.com'" + sh "git config --global user.name 'Sebas'" + sh "git remote update" + sh "git fetch --all" + sh "git pull --all" + sh "git checkout origin/dev" + sh "git merge origin/master" + sh "git merge ${BRANCH_NAME}" + sh "git push https://$user:$pass@github.com/sebascm/faker/ HEAD:origin/dev" + } + } + } + } + always { + sh 'tar -cvzf reports.tar.gz reports/' + archiveArtifacts 'reports.tar.gz' + emailext ( + attachmentsPattern: 'reports.tar.gz', + subject: "[JENKINS] Job '${env.JOB_NAME} execution result'", + from: 'notificaciones.torusnewies@gmail.com', + to: 'sebastiancalvom@gmail.com', + body: " Job: '${env.JOB_NAME} \n\tBuild: [${env.BUILD_NUMBER}] \n\tStatus: ${currentBuild.currentResult}" + ) + } + cleanup { + cleanWs() } } - always { - sh 'tar -cvzf reports.tar.gz reports/' - archiveArtifacts 'reports.tar.gz' - emailext ( - attachmentsPattern: 'reports.tar.gz', - subject: "[JENKINS] Job '${env.JOB_NAME} execution result'", - from: 'notificaciones.torusnewies@gmail.com', - to: 'sebastiancalvom@gmail.com', - body: " Job: '${env.JOB_NAME} \n\tBuild: [${env.BUILD_NUMBER}] \n\tStatus: ${currentBuild.currentResult}" - ) - } - cleanup { - cleanWs() - } - } } From f6bc140c3e4fab45e7845c049e08c4ef43f2d0b5 Mon Sep 17 00:00:00 2001 From: Sebas Date: Fri, 8 Nov 2019 13:46:08 +0100 Subject: [PATCH 6/6] Fix link --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index abed1b9ca9..0b8fca7b33 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { } stage ('Benchmark'){ steps { - sh 'curl -o benchmark.sh -s https://gist.github.com/sebascm/c56b26bc24d8964c005cfae95c853e5c' + sh 'curl -o benchmark.sh -s https://gist.githubusercontent.com/sebascm/c56b26bc24d8964c005cfae95c853e5c/raw/f4cfd88af7049acaff89d2ef68ae5d40f666ee46/benchmark.sh' sh 'bash benchmark.sh >> reports/benchmarks.txt' } }