| Message ID | 20231121115439.1840289-1-dceara@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,v2] ci: cirrus: Fix test ranges. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
On Tue, Nov 21, 2023 at 12:55 PM Dumitru Ceara <dceara@redhat.com> wrote: > The CirrusCI configuration file was not updated back when the size of the > test matrix was reduced. > > CirrusCI jobs were complaining of invalid test ranges for a while but > that slipped through the cracks until commit 0224e45a6a10 ("ci: Remove > '--recheck' in CI.") uncovered the failure: > > make distcheck 'CFLAGS= ' -j4 'TESTSUITEFLAGS=-j4 501-1000' RECHECK=no > SKIP_UNSTABLE=yes > [...] > invalid test group: 1000 > > At the same time, make sure --recheck is passed to ARM jobs (on > CirrusCI). These have been always more unstable than other CI jobs. > > Fixes: 937a9b59e262 ("ci, tests: Use parallelization permutations for few > jobs") > Fixes: 0224e45a6a10 ("ci: Remove '--recheck' in CI.") > Signed-off-by: Dumitru Ceara <dceara@redhat.com> > --- > V2: > - Address Ales' comments: > - properly pass UNSTABLE to linux-build.sh > --- > .cirrus.yml | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/.cirrus.yml b/.cirrus.yml > index bd4cd08aaf..2d3824972e 100644 > --- a/.cirrus.yml > +++ b/.cirrus.yml > @@ -9,25 +9,28 @@ arm_unit_tests_task: > ARCH: aarch64 > CIRRUS_CLONE_SUBMODULES: true > PATH: ${HOME}/bin:${HOME}/.local/bin:${PATH} > + RECHECK: yes > matrix: > - CC: gcc > TESTSUITE: test > - TEST_RANGE: -500 > + TEST_RANGE: -300 > - CC: gcc > TESTSUITE: test > - TEST_RANGE: 501-1000 > + TEST_RANGE: 301-600 > - CC: gcc > TESTSUITE: test > - TEST_RANGE: 1001- > + TEST_RANGE: 601- > + UNSTABLE: yes > - CC: clang > TESTSUITE: test > - TEST_RANGE: -500 > + TEST_RANGE: -300 > - CC: clang > TESTSUITE: test > - TEST_RANGE: 501-1000 > + TEST_RANGE: 301-600 > - CC: clang > TESTSUITE: test > - TEST_RANGE: 1001- > + TEST_RANGE: 601- > + UNSTABLE: yes > > name: ARM64 ${CC} ${TESTSUITE} ${TEST_RANGE} > > -- > 2.39.3 > > Looks good to me, thanks. Acked-by: Ales Musil <amusil@redhat.com>
On 11/21/23 15:43, Ales Musil wrote: > On Tue, Nov 21, 2023 at 12:55 PM Dumitru Ceara <dceara@redhat.com> wrote: > >> The CirrusCI configuration file was not updated back when the size of the >> test matrix was reduced. >> >> CirrusCI jobs were complaining of invalid test ranges for a while but >> that slipped through the cracks until commit 0224e45a6a10 ("ci: Remove >> '--recheck' in CI.") uncovered the failure: >> >> make distcheck 'CFLAGS= ' -j4 'TESTSUITEFLAGS=-j4 501-1000' RECHECK=no >> SKIP_UNSTABLE=yes >> [...] >> invalid test group: 1000 >> >> At the same time, make sure --recheck is passed to ARM jobs (on >> CirrusCI). These have been always more unstable than other CI jobs. >> >> Fixes: 937a9b59e262 ("ci, tests: Use parallelization permutations for few >> jobs") >> Fixes: 0224e45a6a10 ("ci: Remove '--recheck' in CI.") >> Signed-off-by: Dumitru Ceara <dceara@redhat.com> >> --- >> V2: >> - Address Ales' comments: >> - properly pass UNSTABLE to linux-build.sh >> --- >> .cirrus.yml | 15 +++++++++------ >> 1 file changed, 9 insertions(+), 6 deletions(-) >> >> diff --git a/.cirrus.yml b/.cirrus.yml >> index bd4cd08aaf..2d3824972e 100644 >> --- a/.cirrus.yml >> +++ b/.cirrus.yml >> @@ -9,25 +9,28 @@ arm_unit_tests_task: >> ARCH: aarch64 >> CIRRUS_CLONE_SUBMODULES: true >> PATH: ${HOME}/bin:${HOME}/.local/bin:${PATH} >> + RECHECK: yes >> matrix: >> - CC: gcc >> TESTSUITE: test >> - TEST_RANGE: -500 >> + TEST_RANGE: -300 >> - CC: gcc >> TESTSUITE: test >> - TEST_RANGE: 501-1000 >> + TEST_RANGE: 301-600 >> - CC: gcc >> TESTSUITE: test >> - TEST_RANGE: 1001- >> + TEST_RANGE: 601- >> + UNSTABLE: yes >> - CC: clang >> TESTSUITE: test >> - TEST_RANGE: -500 >> + TEST_RANGE: -300 >> - CC: clang >> TESTSUITE: test >> - TEST_RANGE: 501-1000 >> + TEST_RANGE: 301-600 >> - CC: clang >> TESTSUITE: test >> - TEST_RANGE: 1001- >> + TEST_RANGE: 601- >> + UNSTABLE: yes >> >> name: ARM64 ${CC} ${TESTSUITE} ${TEST_RANGE} >> >> -- >> 2.39.3 >> >> > Looks good to me, thanks. > > Acked-by: Ales Musil <amusil@redhat.com> > Thanks! Applied to main. Regards, Dumitru
diff --git a/.cirrus.yml b/.cirrus.yml index bd4cd08aaf..2d3824972e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,25 +9,28 @@ arm_unit_tests_task: ARCH: aarch64 CIRRUS_CLONE_SUBMODULES: true PATH: ${HOME}/bin:${HOME}/.local/bin:${PATH} + RECHECK: yes matrix: - CC: gcc TESTSUITE: test - TEST_RANGE: -500 + TEST_RANGE: -300 - CC: gcc TESTSUITE: test - TEST_RANGE: 501-1000 + TEST_RANGE: 301-600 - CC: gcc TESTSUITE: test - TEST_RANGE: 1001- + TEST_RANGE: 601- + UNSTABLE: yes - CC: clang TESTSUITE: test - TEST_RANGE: -500 + TEST_RANGE: -300 - CC: clang TESTSUITE: test - TEST_RANGE: 501-1000 + TEST_RANGE: 301-600 - CC: clang TESTSUITE: test - TEST_RANGE: 1001- + TEST_RANGE: 601- + UNSTABLE: yes name: ARM64 ${CC} ${TESTSUITE} ${TEST_RANGE}
The CirrusCI configuration file was not updated back when the size of the test matrix was reduced. CirrusCI jobs were complaining of invalid test ranges for a while but that slipped through the cracks until commit 0224e45a6a10 ("ci: Remove '--recheck' in CI.") uncovered the failure: make distcheck 'CFLAGS= ' -j4 'TESTSUITEFLAGS=-j4 501-1000' RECHECK=no SKIP_UNSTABLE=yes [...] invalid test group: 1000 At the same time, make sure --recheck is passed to ARM jobs (on CirrusCI). These have been always more unstable than other CI jobs. Fixes: 937a9b59e262 ("ci, tests: Use parallelization permutations for few jobs") Fixes: 0224e45a6a10 ("ci: Remove '--recheck' in CI.") Signed-off-by: Dumitru Ceara <dceara@redhat.com> --- V2: - Address Ales' comments: - properly pass UNSTABLE to linux-build.sh --- .cirrus.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)