mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 10:27:41 +00:00
Some optimizations for emba jobs
* test/infra/gitlab-ci.yml (.test-template): Remove. (test-all-inotify, test-filenotify-gio, test-gnustep) (test-native-comp-speed0): * test/infra/Makefile.in (subdir_template): Remove .test-template from extends. Add or adapt needs and artifacts. * test/infra/test-jobs.yml: Regenerate.
This commit is contained in:
Michael Albinus
parent
e99bf27158
commit
39e2c214df
3 changed files with 154 additions and 54 deletions
|
|
@ -71,7 +71,10 @@ define subdir_template
|
|||
@echo >>$(FILE)
|
||||
@echo 'test-$(subst /,-,$(1))-inotify:' >>$(FILE)
|
||||
@echo ' stage: normal' >>$(FILE)
|
||||
@echo ' extends: [.job-template, .test-template]' >>$(FILE)
|
||||
@echo ' extends: [.job-template]' >>$(FILE)
|
||||
@echo ' needs:' >>$(FILE)
|
||||
@echo ' - job: build-image-inotify' >>$(FILE)
|
||||
@echo ' optional: true' >>$(FILE)
|
||||
@echo ' rules:' >>$(FILE)
|
||||
@echo " - if: '"'${cps} == "schedule"'"'" >>$(FILE)
|
||||
@echo ' when: never' >>$(FILE)
|
||||
|
|
|
|||
|
|
@ -127,21 +127,6 @@ default:
|
|||
- docker build --pull --target ${target} -t ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} -f test/infra/Dockerfile.emba .
|
||||
- docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
|
||||
|
||||
.test-template:
|
||||
needs: []
|
||||
# Do not run fast and normal test jobs when scheduled.
|
||||
rules:
|
||||
- if: '$CI_JOB_STAGE =~ "fast|normal" && $CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
- when: always
|
||||
artifacts:
|
||||
name: ${test_name}
|
||||
public: true
|
||||
expire_in: 1 week
|
||||
paths:
|
||||
- "**.log"
|
||||
when: always
|
||||
|
||||
.gnustep-template:
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "web"'
|
||||
|
|
@ -204,11 +189,21 @@ include: '/test/infra/test-jobs.yml'
|
|||
test-all-inotify:
|
||||
# This tests also file monitor libraries inotify and inotifywatch.
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
# Note there's no "changes" section, so this always runs on a schedule.
|
||||
- if: '$CI_PIPELINE_SOURCE == "web"'
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
artifacts:
|
||||
name: ${test_name}
|
||||
public: true
|
||||
expire_in: 1 week
|
||||
paths:
|
||||
- "**/*.log"
|
||||
when: always
|
||||
variables:
|
||||
target: emacs-inotify
|
||||
make_params: check-expensive
|
||||
|
|
@ -222,8 +217,10 @@ build-image-filenotify-gio:
|
|||
test-filenotify-gio:
|
||||
# This tests file monitor libraries gfilemonitor and gio.
|
||||
stage: platforms
|
||||
extends: [.job-template, .test-template, .filenotify-gio-template]
|
||||
needs: [build-image-filenotify-gio]
|
||||
extends: [.job-template, .filenotify-gio-template]
|
||||
needs:
|
||||
- job: build-image-filenotify-gio
|
||||
optional: true
|
||||
variables:
|
||||
target: emacs-filenotify-gio
|
||||
make_params: "-k -C test autorevert-tests.log filenotify-tests.log"
|
||||
|
|
@ -238,7 +235,9 @@ test-gnustep:
|
|||
# This tests the GNUstep build process.
|
||||
stage: platforms
|
||||
extends: [.job-template, .gnustep-template]
|
||||
needs: [build-image-gnustep]
|
||||
needs:
|
||||
- job: build-image-gnustep
|
||||
optional: true
|
||||
variables:
|
||||
target: emacs-gnustep
|
||||
make_params: install
|
||||
|
|
@ -263,8 +262,10 @@ build-native-comp-speed2:
|
|||
|
||||
test-native-comp-speed0:
|
||||
stage: native-comp
|
||||
extends: [.job-template, .test-template, .native-comp-template]
|
||||
needs: [build-native-comp-speed0]
|
||||
extends: [.job-template, .native-comp-template]
|
||||
needs:
|
||||
- job: build-native-comp-speed0
|
||||
optional: true
|
||||
variables:
|
||||
target: emacs-native-comp-speed0
|
||||
make_params: "-C test check SELECTOR='(not (tag :unstable))'"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
|
||||
test-lib-src-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -22,7 +25,10 @@ test-lib-src-inotify:
|
|||
|
||||
test-lisp-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -43,7 +49,10 @@ test-lisp-inotify:
|
|||
|
||||
test-lisp-calc-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -64,7 +73,10 @@ test-lisp-calc-inotify:
|
|||
|
||||
test-lisp-calendar-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -85,7 +97,10 @@ test-lisp-calendar-inotify:
|
|||
|
||||
test-lisp-cedet-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -106,7 +121,10 @@ test-lisp-cedet-inotify:
|
|||
|
||||
test-lisp-cedet-semantic-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -127,7 +145,10 @@ test-lisp-cedet-semantic-inotify:
|
|||
|
||||
test-lisp-cedet-semantic-bovine-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -148,7 +169,10 @@ test-lisp-cedet-semantic-bovine-inotify:
|
|||
|
||||
test-lisp-cedet-srecode-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -169,7 +193,10 @@ test-lisp-cedet-srecode-inotify:
|
|||
|
||||
test-lisp-emacs-lisp-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -190,7 +217,10 @@ test-lisp-emacs-lisp-inotify:
|
|||
|
||||
test-lisp-emacs-lisp-eieio-tests-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -211,7 +241,10 @@ test-lisp-emacs-lisp-eieio-tests-inotify:
|
|||
|
||||
test-lisp-emacs-lisp-faceup-tests-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -232,7 +265,10 @@ test-lisp-emacs-lisp-faceup-tests-inotify:
|
|||
|
||||
test-lisp-emulation-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -253,7 +289,10 @@ test-lisp-emulation-inotify:
|
|||
|
||||
test-lisp-erc-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -274,7 +313,10 @@ test-lisp-erc-inotify:
|
|||
|
||||
test-lisp-eshell-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -295,7 +337,10 @@ test-lisp-eshell-inotify:
|
|||
|
||||
test-lisp-gnus-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -316,7 +361,10 @@ test-lisp-gnus-inotify:
|
|||
|
||||
test-lisp-image-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -337,7 +385,10 @@ test-lisp-image-inotify:
|
|||
|
||||
test-lisp-international-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -358,7 +409,10 @@ test-lisp-international-inotify:
|
|||
|
||||
test-lisp-mail-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -379,7 +433,10 @@ test-lisp-mail-inotify:
|
|||
|
||||
test-lisp-mh-e-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -400,7 +457,10 @@ test-lisp-mh-e-inotify:
|
|||
|
||||
test-lisp-net-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -421,7 +481,10 @@ test-lisp-net-inotify:
|
|||
|
||||
test-lisp-nxml-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -442,7 +505,10 @@ test-lisp-nxml-inotify:
|
|||
|
||||
test-lisp-obsolete-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -463,7 +529,10 @@ test-lisp-obsolete-inotify:
|
|||
|
||||
test-lisp-org-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -484,7 +553,10 @@ test-lisp-org-inotify:
|
|||
|
||||
test-lisp-play-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -505,7 +577,10 @@ test-lisp-play-inotify:
|
|||
|
||||
test-lisp-progmodes-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -526,7 +601,10 @@ test-lisp-progmodes-inotify:
|
|||
|
||||
test-lisp-so-long-tests-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -547,7 +625,10 @@ test-lisp-so-long-tests-inotify:
|
|||
|
||||
test-lisp-term-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -568,7 +649,10 @@ test-lisp-term-inotify:
|
|||
|
||||
test-lisp-textmodes-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -589,7 +673,10 @@ test-lisp-textmodes-inotify:
|
|||
|
||||
test-lisp-url-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -610,7 +697,10 @@ test-lisp-url-inotify:
|
|||
|
||||
test-lisp-vc-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -631,7 +721,10 @@ test-lisp-vc-inotify:
|
|||
|
||||
test-misc-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
@ -652,7 +745,10 @@ test-misc-inotify:
|
|||
|
||||
test-src-inotify:
|
||||
stage: normal
|
||||
extends: [.job-template, .test-template]
|
||||
extends: [.job-template]
|
||||
needs:
|
||||
- job: build-image-inotify
|
||||
optional: true
|
||||
rules:
|
||||
- if: '$CI_PIPELINE_SOURCE == "schedule"'
|
||||
when: never
|
||||
|
|
|
|||
Loading…
Reference in a new issue