| Message ID | 20201108221925.2344515-7-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,01/11] gitlab-ci: Drop generic cache rule | expand |
Once Cleber said "acceptance" wasn't a good name for those tests. Indeed "integration" is widely used, so okay for this renaming. On 11/8/20 8:19 PM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > .gitlab-ci.yml | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 0ef814764a0..d4526323169 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -42,7 +42,7 @@ include: > - find . -type f -exec touch {} + > - make $MAKE_CHECK_ARGS > > -.acceptance_test_job: > +.integration_test_job: > extends: .native_test_job > cache: > key: "${CI_JOB_NAME}-cache" > @@ -89,8 +89,8 @@ check-system-ubuntu: > IMAGE: ubuntu2004 > MAKE_CHECK_ARGS: check > > -acceptance-system-ubuntu: > - extends: .acceptance_test_job > +integration-system-ubuntu: > + extends: .integration_test_job > needs: > - job: build-system-ubuntu > artifacts: true > @@ -119,8 +119,8 @@ check-system-debian: > IMAGE: debian-amd64 > MAKE_CHECK_ARGS: check > > -acceptance-system-debian: > - extends: .acceptance_test_job > +integration-system-debian: > + extends: .integration_test_job > needs: > - job: build-system-debian > artifacts: true > @@ -150,8 +150,8 @@ check-system-fedora: > IMAGE: fedora > MAKE_CHECK_ARGS: check > > -acceptance-system-fedora: > - extends: .acceptance_test_job > +integration-system-fedora: > + extends: .integration_test_job > needs: > - job: build-system-fedora > artifacts: true > @@ -181,8 +181,8 @@ check-system-centos: > IMAGE: centos8 > MAKE_CHECK_ARGS: check > > -acceptance-system-centos: > - extends: .acceptance_test_job > +integration-system-centos: > + extends: .integration_test_job > needs: > - job: build-system-centos > artifacts: true
On 10/11/2020 21.42, Wainer dos Santos Moschetta wrote: > Once Cleber said "acceptance" wasn't a good name for those tests. Indeed > "integration" is widely used, so okay for this renaming. Should we maybe also rename the folder and "make check-acceptance" into "make check-integration" ? Thomas
On 11/12/20 5:02 AM, Thomas Huth wrote: > On 10/11/2020 21.42, Wainer dos Santos Moschetta wrote: >> Once Cleber said "acceptance" wasn't a good name for those tests. Indeed >> "integration" is widely used, so okay for this renaming. > Should we maybe also rename the folder and "make check-acceptance" into > "make check-integration" ? I'm okay with that. But I also would like to hear from Cleber. - Wainer > > Thomas > >
On 11/12/20 9:31 PM, Wainer dos Santos Moschetta wrote: > > On 11/12/20 5:02 AM, Thomas Huth wrote: >> On 10/11/2020 21.42, Wainer dos Santos Moschetta wrote: >>> Once Cleber said "acceptance" wasn't a good name for those tests. >>> Indeed >>> "integration" is widely used, so okay for this renaming. >> Should we maybe also rename the folder and "make check-acceptance" into >> "make check-integration" ? > > I'm okay with that. But I also would like to hear from Cleber. This is the plan indeed, but out of the scope of this (gitlab-ci specific) series. 'check-acceptance' might then depend on 'check-integration'. > > - Wainer > >> >> Thomas >> >> >
On Sun, Nov 8, 2020 at 7:27 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > .gitlab-ci.yml | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 0ef814764a0..d4526323169 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -42,7 +42,7 @@ include: > - find . -type f -exec touch {} + > - make $MAKE_CHECK_ARGS > > -.acceptance_test_job: > +.integration_test_job: > extends: .native_test_job > cache: > key: "${CI_JOB_NAME}-cache" > @@ -89,8 +89,8 @@ check-system-ubuntu: > IMAGE: ubuntu2004 > MAKE_CHECK_ARGS: check > > -acceptance-system-ubuntu: > - extends: .acceptance_test_job > +integration-system-ubuntu: > + extends: .integration_test_job > needs: > - job: build-system-ubuntu > artifacts: true > @@ -119,8 +119,8 @@ check-system-debian: > IMAGE: debian-amd64 > MAKE_CHECK_ARGS: check > > -acceptance-system-debian: > - extends: .acceptance_test_job > +integration-system-debian: > + extends: .integration_test_job > needs: > - job: build-system-debian > artifacts: true > @@ -150,8 +150,8 @@ check-system-fedora: > IMAGE: fedora > MAKE_CHECK_ARGS: check > > -acceptance-system-fedora: > - extends: .acceptance_test_job > +integration-system-fedora: > + extends: .integration_test_job > needs: > - job: build-system-fedora > artifacts: true > @@ -181,8 +181,8 @@ check-system-centos: > IMAGE: centos8 > MAKE_CHECK_ARGS: check > > -acceptance-system-centos: > - extends: .acceptance_test_job > +integration-system-centos: > + extends: .integration_test_job > needs: > - job: build-system-centos > artifacts: true > -- > 2.26.2 > > Makes sense, thanks! Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ef814764a0..d4526323169 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ include: - find . -type f -exec touch {} + - make $MAKE_CHECK_ARGS -.acceptance_test_job: +.integration_test_job: extends: .native_test_job cache: key: "${CI_JOB_NAME}-cache" @@ -89,8 +89,8 @@ check-system-ubuntu: IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check -acceptance-system-ubuntu: - extends: .acceptance_test_job +integration-system-ubuntu: + extends: .integration_test_job needs: - job: build-system-ubuntu artifacts: true @@ -119,8 +119,8 @@ check-system-debian: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check -acceptance-system-debian: - extends: .acceptance_test_job +integration-system-debian: + extends: .integration_test_job needs: - job: build-system-debian artifacts: true @@ -150,8 +150,8 @@ check-system-fedora: IMAGE: fedora MAKE_CHECK_ARGS: check -acceptance-system-fedora: - extends: .acceptance_test_job +integration-system-fedora: + extends: .integration_test_job needs: - job: build-system-fedora artifacts: true @@ -181,8 +181,8 @@ check-system-centos: IMAGE: centos8 MAKE_CHECK_ARGS: check -acceptance-system-centos: - extends: .acceptance_test_job +integration-system-centos: + extends: .integration_test_job needs: - job: build-system-centos artifacts: true
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)