Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-balance CI tests so the entire job finishes quicker #711

Merged
merged 3 commits into from
Jan 26, 2024
Merged

Re-balance CI tests so the entire job finishes quicker #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2ed744
Re-balance CI tests so the entire job finishes quicker.
shorowit Jan 26, 2024
9b74d76
Remove obsolete file [ci skip]
shorowit Jan 26, 2024
24a7c35
Latest results.
Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions .github/workflows/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch:

jobs:
run-unit-tests:
run-ruleset-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
Expand All @@ -33,9 +33,9 @@ jobs:
git config --global --add safe.directory $(realpath .)
git diff --exit-code --ignore-cr-at-eol workflow/*.xml

- name: Run measure unit tests
- name: Run ruleset tests
run: |
bundle exec rake test_measures
bundle exec rake test_rulesets

- name: Store code coverage
uses: actions/upload-artifact@v3
Expand All @@ -54,7 +54,7 @@ jobs:
name: documentation
path: docs/_build/html/

run-eri-tests:
run-sample-files1-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
Expand All @@ -67,17 +67,17 @@ jobs:
run: |
rm -f Gemfile.lock && bundle install

- name: Run ERI tests
- name: Run Sample Files 1 tests
run: |
bundle exec rake test_eri
bundle exec rake test_sample_files1

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/test_results
name: test_results_eri
name: test_results_sample_files1

run-real-home-tests:
run-sample-files2-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
Expand All @@ -90,17 +90,17 @@ jobs:
run: |
rm -f Gemfile.lock && bundle install

- name: Run Real Home tests
- name: Run Sample Files 2 tests
run: |
bundle exec rake test_real_homes
bundle exec rake test_sample_files2

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/test_results
name: test_results_real_homes
name: test_results_sample_files2

run-resnet-tests:
run-real-home-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
Expand All @@ -113,17 +113,17 @@ jobs:
run: |
rm -f Gemfile.lock && bundle install

- name: Run RESNET tests
- name: Run Real Home tests
run: |
bundle exec rake test_resnet
bundle exec rake test_real_homes

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/test_results
name: test_results_resnet
name: test_results_real_homes

run-es-zerh-tests:
run-other-tests:
runs-on: ubuntu-latest
container:
image: docker://nrel/openstudio:3.7.0
Expand All @@ -136,15 +136,15 @@ jobs:
run: |
rm -f Gemfile.lock && bundle install

- name: Run ES & ZERH tests
- name: Run Other tests
run: |
bundle exec rake test_es_zerh
bundle exec rake test_other

- name: Store results
uses: actions/upload-artifact@v3
with:
path: workflow/tests/test_results
name: test_results_es_zerh
name: test_results_other

run-windows-tests:
runs-on: windows-latest
Expand All @@ -164,7 +164,7 @@ jobs:
compare-results:
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
needs: [run-eri-tests, run-real-home-tests, run-resnet-tests, run-es-zerh-tests]
needs: [run-sample-files1-tests, run-sample-files2-tests, run-real-home-tests, run-other-tests]
steps:
- uses: actions/checkout@v3
with:
Expand All @@ -187,33 +187,33 @@ jobs:
base_results
name: base_results

- name: Download ERI feature results
- name: Download Sample Files 1 feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_eri
name: test_results_sample_files1

- name: Download Real Home feature results
- name: Download Sample Files 2 feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_real_homes
name: test_results_sample_files2

- name: Download RESNET feature results
- name: Download Real Home feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_resnet
name: test_results_real_homes

- name: Download ES & ZERH feature results
- name: Download Other feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_es_zerh
name: test_results_other

- name: Compare results
run: |
Expand All @@ -237,39 +237,39 @@ jobs:

update-results:
runs-on: ubuntu-latest
needs: [run-eri-tests, run-real-home-tests, run-resnet-tests, run-es-zerh-tests]
needs: [run-sample-files1-tests, run-sample-files2-tests, run-real-home-tests, run-other-tests]
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.head_ref }}

- name: Download ERI feature results
- name: Download Sample Files 1 feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_eri
name: test_results_sample_files1

- name: Download Real Home feature results
- name: Download Sample Files 2 feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_real_homes
name: test_results_sample_files2

- name: Download RESNET feature results
- name: Download Real Home feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_resnet
name: test_results_real_homes

- name: Download ES & ZERH feature results
- name: Download Other feature results
uses: actions/download-artifact@v3
with:
path: |
results
name: test_results_es_zerh
name: test_results_other

- name: Commit latest results
shell: bash
Expand Down
28 changes: 14 additions & 14 deletions Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,37 @@ Rake::TestTask.new('test_all') do |t|
t.verbose = true
end

desc 'Run measure unit tests'
Rake::TestTask.new('test_measures') do |t|
desc 'Run ruleset tests'
Rake::TestTask.new('test_rulesets') do |t|
t.test_files = Dir['rulesets/tests/*.rb']
t.warning = false
t.verbose = true
end

desc 'Run ERI tests'
Rake::TestTask.new('test_eri') do |t|
t.test_files = Dir['workflow/tests/energy_rating_index_test.rb']
desc 'Run Sample Files 1 tests'
Rake::TestTask.new('test_sample_files1') do |t|
t.test_files = Dir['workflow/tests/sample_files1_test.rb']
t.warning = false
t.verbose = true
end

desc 'Run Real Home tests'
Rake::TestTask.new('test_real_homes') do |t|
t.test_files = Dir['workflow/tests/real_homes_test.rb']
desc 'Run Sample Files 2 tests'
Rake::TestTask.new('test_sample_files2') do |t|
t.test_files = Dir['workflow/tests/sample_files2_test.rb']
t.warning = false
t.verbose = true
end

desc 'Run RESNET tests'
Rake::TestTask.new('test_resnet') do |t|
t.test_files = Dir['workflow/tests/resnet*test.rb']
desc 'Run Real Home tests'
Rake::TestTask.new('test_real_homes') do |t|
t.test_files = Dir['workflow/tests/real_homes_test.rb']
t.warning = false
t.verbose = true
end

desc 'Run ES & ZERH tests'
Rake::TestTask.new('test_es_zerh') do |t|
t.test_files = Dir['workflow/tests/es_zerh_test.rb']
desc 'Run Other tests'
Rake::TestTask.new('test_other') do |t|
t.test_files = Dir['workflow/tests/*test.rb'] - Dir['workflow/tests/real_homes_test.rb'] - Dir['workflow/tests/sample_files*test.rb']
t.warning = false
t.verbose = true
end
Loading