.gitlab-ci.yml: use gitlab 9.0 varaible names

Gitlab 9.0 prefers "job" instead of "build" for CI variables names.
http://docs.gitlab.com/ce/ci/variables/README.html#9-0-renaming

Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebaac7a3d9d088a1ce4b6b9b1f8989a6beb3b8ce..0dddb22f12423809e6eea1a4433fcbdc6fbc8489 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ image: buildroot/base
 
 .defconfig_script: &defconfig_script
     - echo 'Configure Buildroot'
-    - make ${CI_BUILD_NAME}
+    - make ${CI_JOB_NAME}
     - echo 'Build buildroot'
     - |
         make > >(tee build.log |grep '>>>') 2>&1 || {
@@ -51,7 +51,7 @@ check-DEVELOPERS:
     # runner will clean up those files for us.
     # Multiply every emulator timeout by 10 to avoid sporadic failures in
     # elastic runners.
-    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_BUILD_NAME}
+    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
     artifacts:
         when: always
         expire_in: 2 weeks

diff --git a/.gitlab-ci.yml.in b/.gitlab-ci.yml.in
index 3abf7d53139d417c20c3a53635d7572e6e133f3a..33c7b13725235ced7471418d95444700a5718a18 100644 (file)
--- a/.gitlab-ci.yml.in
+++ b/.gitlab-ci.yml.in
@@ -8,7 +8,7 @@ image: buildroot/base
 
 .defconfig_script: &defconfig_script
     - echo 'Configure Buildroot'
-    - make ${CI_BUILD_NAME}
+    - make ${CI_JOB_NAME}
     - echo 'Build buildroot'
     - |
         make > >(tee build.log |grep '>>>') 2>&1 || {
@@ -51,7 +51,7 @@ check-DEVELOPERS:
     # runner will clean up those files for us.
     # Multiply every emulator timeout by 10 to avoid sporadic failures in
     # elastic runners.
-    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_BUILD_NAME}
+    script: ./support/testing/run-tests -o test-output/ -d test-dl/ -k --timeout-multiplier 10 ${CI_JOB_NAME}
     artifacts:
         when: always
         expire_in: 2 weeks