From patchwork Mon Oct 23 14:26:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preston X-Patchwork-Id: 829337 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yLK9J0bQhz9t6Y for ; Tue, 24 Oct 2017 01:51:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B4F886AA4; Mon, 23 Oct 2017 14:51:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z-T9fWMsdNSJ; Mon, 23 Oct 2017 14:51:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1886586A1F; Mon, 23 Oct 2017 14:51:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E3ADE1C3F96 for ; Mon, 23 Oct 2017 14:51:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DEE34871DA for ; Mon, 23 Oct 2017 14:51:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c6sft+MC-fYD for ; Mon, 23 Oct 2017 14:51:19 +0000 (UTC) X-Greylist: delayed 00:25:01 by SQLgrey-1.7.6 Received: from imap1.codethink.co.uk (imap1.codethink.co.uk [176.9.8.82]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7C1E7871D6 for ; Mon, 23 Oct 2017 14:51:19 +0000 (UTC) Received: from [167.98.27.226] (helo=devhw0) by imap1.codethink.co.uk with esmtpsa (Exim 4.84_2 #1 (Debian)) id 1e6dgH-0006yV-2f; Mon, 23 Oct 2017 15:26:17 +0100 Received: from tpreston by devhw0 with local (Exim 4.89) (envelope-from ) id 1e6dgF-00030X-E9; Mon, 23 Oct 2017 15:26:15 +0100 From: Thomas Preston To: buildroot@buildroot.org Date: Mon, 23 Oct 2017 15:26:14 +0100 Message-Id: <20171023142614.11522-1-thomas.preston@codethink.co.uk> X-Mailer: git-send-email 2.11.0 Cc: Thomas Preston Subject: [Buildroot] [PATCH 1/1] .gitlab-ci.yml: use gitlab 9.0 varaible names X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- .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