Backport: Enable native speed 2 EMBA build and tests and disable speed 0

	* test/infra/gitlab-ci.yml (build-native-comp-speed2): Uncomment.
	(build-native-comp-speed0): Comment.
	(test-native-comp-speed0): Remove.
	(test-native-comp-speed2): Add.

(cherry picked from commit 06bf218f69a62d5d5c8d3b3767d7db8d9fb4bb9f)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 64b47eb7e47f0bb1d5103f77bc47699ee4e20620..96fe9e3a1c3363956b89fdea19bfe4c45baf2db5 100644 (file)
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -246,32 +246,32 @@ test-gnustep:
     target: emacs-gnustep
     make_params: install
 
-build-native-comp-speed0:
-  stage: native-comp-images
-  extends: [.job-template, .build-template, .native-comp-template]
-  variables:
-    target: emacs-native-comp-speed0
-
-# build-native-comp-speed1:
+# build-native-comp-speed0:
 #   stage: native-comp-images
 #   extends: [.job-template, .build-template, .native-comp-template]
 #   variables:
-#     target: emacs-native-comp-speed1
+#     target: emacs-native-comp-speed0
 
-# build-native-comp-speed2:
+# build-native-comp-speed1:
 #   stage: native-comp-images
 #   extends: [.job-template, .build-template, .native-comp-template]
 #   variables:
-#     target: emacs-native-comp-speed2
+#     target: emacs-native-comp-speed1
+
+build-native-comp-speed2:
+  stage: native-comp-images
+  extends: [.job-template, .build-template, .native-comp-template]
+  variables:
+    target: emacs-native-comp-speed2
 
-test-native-comp-speed0:
+test-native-comp-speed2:
   stage: native-comp
   extends: [.job-template, .test-template, .native-comp-template]
   needs:
-    - job: build-native-comp-speed0
+    - job: build-native-comp-speed2
       optional: true
   variables:
-    target: emacs-native-comp-speed0
+    target: emacs-native-comp-speed2
     make_params: "-k -C test check SELECTOR='(not (tag :unstable))'"
 
 # Local Variables: