diff --git a/.gitignore b/.gitignore index f29ad0c6e..b6c6b014c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /build/* +/.bundle data/*.json data/*.csv data/*.txt @@ -8,3 +9,4 @@ continuous_reporting/single_iter_data/* **/temp.json .DS_Store bench_params.json +/vendor diff --git a/continuous_reporting/gh_tasks/check_reporting.sh b/continuous_reporting/gh_tasks/check_reporting.sh index e863314b5..863f7938a 100755 --- a/continuous_reporting/gh_tasks/check_reporting.sh +++ b/continuous_reporting/gh_tasks/check_reporting.sh @@ -9,6 +9,8 @@ chruby 3.0.2 cd ~/ym/yjit-metrics git pull +bundle + # Copy benchmark raw data into destination repo #ruby continuous_reporting/file_benchmark_data_into_raw.rb -d continuous_reporting/data diff --git a/continuous_reporting/gh_tasks/check_reporting_minimal.sh b/continuous_reporting/gh_tasks/check_reporting_minimal.sh index 72248b751..8720d361b 100755 --- a/continuous_reporting/gh_tasks/check_reporting_minimal.sh +++ b/continuous_reporting/gh_tasks/check_reporting_minimal.sh @@ -11,6 +11,8 @@ chruby 3.0.2 cd ~/ym/yjit-metrics +bundle + # Copy benchmark raw data into destination repo #ruby continuous_reporting/file_benchmark_data_into_raw.rb -d continuous_reporting/data diff --git a/continuous_reporting/gh_tasks/commit_benchmark_data.sh b/continuous_reporting/gh_tasks/commit_benchmark_data.sh index 38d9eb623..7aff6f18e 100755 --- a/continuous_reporting/gh_tasks/commit_benchmark_data.sh +++ b/continuous_reporting/gh_tasks/commit_benchmark_data.sh @@ -16,6 +16,8 @@ chruby 3.0.2 # If there is uncommitted data after a benchmark run, get it into (all?) raw_benchmarks where it belongs cd ~/ym/yjit-metrics +bundle + # NOTE: This data dir is not configurable. If we run a smoke test on jenkins # into a different data dir we explicitly do not want to include that here. # In that case this will run, find no data, and do nothing (which is what we want). diff --git a/continuous_reporting/gh_tasks/generate_bench_params.sh b/continuous_reporting/gh_tasks/generate_bench_params.sh index 167182734..a0a11d536 100755 --- a/continuous_reporting/gh_tasks/generate_bench_params.sh +++ b/continuous_reporting/gh_tasks/generate_bench_params.sh @@ -10,6 +10,8 @@ chruby 3.0.2 cd ~/ym/yjit-metrics git checkout main && git pull +bundle + # No timestamp given, default to right now ruby continuous_reporting/create_json_params_file.rb --full-rebuild=$FULL_REBUILD --bench-type="$BENCH_TYPE" --yjit-metrics-name=$YJIT_METRICS_NAME --yjit-metrics-repo=$YJIT_METRICS_REPO --yjit-bench-name=$YJIT_BENCH_NAME --yjit-bench-repo=$YJIT_BENCH_REPO --cruby-name=$CRUBY_NAME --cruby-repo=$CRUBY_REPO --benchmark-data-dir=$BENCH_DATA_DIR diff --git a/continuous_reporting/gh_tasks/report_and_upload.sh b/continuous_reporting/gh_tasks/report_and_upload.sh index 8960d1503..4d76f62f9 100755 --- a/continuous_reporting/gh_tasks/report_and_upload.sh +++ b/continuous_reporting/gh_tasks/report_and_upload.sh @@ -10,6 +10,8 @@ chruby 3.0.2 cd ~/ym/yjit-metrics +bundle + # Copy benchmark raw data into destination repo, generate reports, commit changes to Git. ruby continuous_reporting/generate_and_upload_reports.rb diff --git a/continuous_reporting/gh_tasks/report_full_rebuild.sh b/continuous_reporting/gh_tasks/report_full_rebuild.sh index b06d2bfae..bbe225419 100755 --- a/continuous_reporting/gh_tasks/report_full_rebuild.sh +++ b/continuous_reporting/gh_tasks/report_full_rebuild.sh @@ -10,6 +10,8 @@ chruby 3.0.2 cd ~/ym/yjit-metrics +bundle + # Copy benchmark raw data into destination repo, generate reports, commit changes to Git. # The --regenerate-reports argument will regenerate ***all*** reports, which can take quite a # long time. It will also occasionally hit a Ruby error, so we should update from 3.0.2 when diff --git a/continuous_reporting/gh_tasks/run_benchmarks.sh b/continuous_reporting/gh_tasks/run_benchmarks.sh index 043b00e2f..444ebf79f 100755 --- a/continuous_reporting/gh_tasks/run_benchmarks.sh +++ b/continuous_reporting/gh_tasks/run_benchmarks.sh @@ -6,6 +6,8 @@ set -e chruby 3.0.2 cd ~/ym/yjit-metrics +bundle + ruby continuous_reporting/benchmark_and_update.rb --no-gh-issue --no-perf-tripwires --bench-params=$BENCH_PARAMS echo "Completed benchmarking successfully." diff --git a/continuous_reporting/gh_tasks/run_single_iter_benchmarks.sh b/continuous_reporting/gh_tasks/run_single_iter_benchmarks.sh index 1422f200c..da194cb0c 100755 --- a/continuous_reporting/gh_tasks/run_single_iter_benchmarks.sh +++ b/continuous_reporting/gh_tasks/run_single_iter_benchmarks.sh @@ -12,6 +12,8 @@ chruby 3.0.2 cd ~/ym/yjit-metrics +bundle + ruby continuous_reporting/benchmark_and_update.rb --benchmark-type smoketest --no-gh-issue --no-perf-tripwires --bench-params=$BENCH_PARAMS --data-dir=continuous_reporting/single_iter_data echo "Completed smoke-test benchmarking successfully." diff --git a/continuous_reporting/jenkins/Jenkinsfile_benchmark_smoke_run b/continuous_reporting/jenkins/Jenkinsfile_benchmark_smoke_run index 75bcc5c81..62016f9e1 100644 --- a/continuous_reporting/jenkins/Jenkinsfile_benchmark_smoke_run +++ b/continuous_reporting/jenkins/Jenkinsfile_benchmark_smoke_run @@ -17,6 +17,7 @@ pipeline { } environment { + BUNDLE_DEPLOYMENT = 'true' SLACK_OAUTH_TOKEN = credentials('684cd699-feae-4ef1-8483-e71440a73fcd') NOTIFIER_ARGS = "--template smoke_test --channels \"${params.SLACK_FAILURE_NOTIFY}\" --properties \"RUBY=${params.RUBY_VERSION},YJIT_BENCH=${params.YJIT_BENCH_VERSION},YJIT_METRICS=${params.YJIT_METRICS_VERSION}\"" } diff --git a/continuous_reporting/jenkins/Jenkinsfile_configurable_run b/continuous_reporting/jenkins/Jenkinsfile_configurable_run index b2995ef26..558189e98 100644 --- a/continuous_reporting/jenkins/Jenkinsfile_configurable_run +++ b/continuous_reporting/jenkins/Jenkinsfile_configurable_run @@ -98,6 +98,10 @@ pipeline { ) } + environment { + BUNDLE_DEPLOYMENT = 'true' + } + stages { stage('generate_params') { environment { diff --git a/continuous_reporting/jenkins/Jenkinsfile_data_checkin_and_upload b/continuous_reporting/jenkins/Jenkinsfile_data_checkin_and_upload index bf9cfdc3f..49bb33036 100644 --- a/continuous_reporting/jenkins/Jenkinsfile_data_checkin_and_upload +++ b/continuous_reporting/jenkins/Jenkinsfile_data_checkin_and_upload @@ -29,6 +29,10 @@ pipeline { ) } + environment { + BUNDLE_DEPLOYMENT = 'true' + } + stages { // This stage commits and pushes the benchmark data from its directory, but doesn't get it there from yjit-metrics/continuous_reporting/data stage('data checkin') { diff --git a/continuous_reporting/jenkins/Jenkinsfile_full_benchmark_run b/continuous_reporting/jenkins/Jenkinsfile_full_benchmark_run index 66e582487..36848a925 100644 --- a/continuous_reporting/jenkins/Jenkinsfile_full_benchmark_run +++ b/continuous_reporting/jenkins/Jenkinsfile_full_benchmark_run @@ -26,6 +26,7 @@ pipeline { } environment { + BUNDLE_DEPLOYMENT = 'true' SLACK_OAUTH_TOKEN = credentials('684cd699-feae-4ef1-8483-e71440a73fcd') NOTIFIER_ARGS = "--template build_status --channels \"${params.SLACK_FAILURE_NOTIFY}\"" } diff --git a/continuous_reporting/jenkins/Jenkinsfile_reporting_rebuild b/continuous_reporting/jenkins/Jenkinsfile_reporting_rebuild index b6287b571..f2d00a546 100644 --- a/continuous_reporting/jenkins/Jenkinsfile_reporting_rebuild +++ b/continuous_reporting/jenkins/Jenkinsfile_reporting_rebuild @@ -14,6 +14,7 @@ pipeline { agent any environment { + BUNDLE_DEPLOYMENT = 'true' SSH_HOST = credentials('2ea5f8cb-6fab-4454-b7cb-46ca2fd3cba7') }