From 3e869e04be9c0c8b5ab42e7107c70c82c6896631 Mon Sep 17 00:00:00 2001 From: Thomas Preston Date: Mon, 23 Oct 2017 15:26:14 +0100 Subject: [PATCH] .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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- .gitlab-ci.yml | 4 ++-- .gitlab-ci.yml.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebaac7a3d9..0dddb22f12 100644 --- 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 3abf7d5313..33c7b13725 100644 --- 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 -- 2.30.2