From patchwork Tue Oct 26 10:22:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 516179 Delivered-To: patch@linaro.org Received: by 2002:ac0:c404:0:0:0:0:0 with SMTP id t4csp137260imj; Tue, 26 Oct 2021 03:24:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvjef78SlVCToZ/hz9LUj7A+wCAQh3u3TZCyM162K7MESqD16p680xwegKXiBPKf7zU+n+ X-Received: by 2002:a05:6808:10ca:: with SMTP id s10mr16098217ois.62.1635243843888; Tue, 26 Oct 2021 03:24:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635243843; cv=none; d=google.com; s=arc-20160816; b=viOiKtZwR4KZJjQ7gARaBrXhBetbgZK5rZKf68ky22q2qxE3YN880gBsoHwgi5UirN QJRDTRxaI/6Dg9NzvyQ/rkil2HjORiKwqrQFetcco7P6QihyczvwZUk5dG0xXNEhzQ64 XVDdGG4H3HxqwFjd7gHw//vjOKy382HfZNno2bHnqXofER5fDIJrvSPCkQRAybQKMQox JFKRygnD5idn/Hc0Gv1eEaIyAQV63oRtgQjIXo7yL6DQ+OaK5iViFupi+CMLMYdab+SF s/pZPvTnqRsLenaIr1JQCW1GqRIH5X3/TcBUlxI0/RuD0pqGU92rmApRQBK3/3b3thWc xthA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=i/ilTMHjD7pndzO8L34GGfxe3eBn4K4fjkK0HYYsKOc=; b=XKU3c6dEy8xeOLbj/0MT/fjYg242A+/iEd3ZogeRxWSSVfW3jHnJCrfO+RYfm+V+IY bS2C9VstaBAtwrCYhH4a8wLAjHTxH6+GD+d5SpnGDL+CQT2ozh+eEk33nt8QNG45F32G hGYRe3162J2Gyy0KQov91vY/dpVtCpctjQHr7rG+PLRrTxLa1mvs65A1oXypb05rB3I1 CLUGROmpNqq4h9wGzl1wQCpbtEbfMnjKX5USXg7dWobccP32GTkUGxNElxGzEPqM+x/k lpu5ZRdIhsKxFPwvtVoQD+kxPBMIOkCO3ilcLL9+KNl9cPYSm7ckbyBYEUnUCe3oh0KI HXJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FT3wVJa2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r6si831153ots.68.2021.10.26.03.24.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Oct 2021 03:24:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FT3wVJa2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfJch-0000rM-7K for patch@linaro.org; Tue, 26 Oct 2021 06:24:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfJbT-0000qx-0Q for qemu-devel@nongnu.org; Tue, 26 Oct 2021 06:22:47 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:43545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mfJbN-0007Ph-TK for qemu-devel@nongnu.org; Tue, 26 Oct 2021 06:22:45 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 67-20020a1c1946000000b0030d4c90fa87so1657854wmz.2 for ; Tue, 26 Oct 2021 03:22:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i/ilTMHjD7pndzO8L34GGfxe3eBn4K4fjkK0HYYsKOc=; b=FT3wVJa2m05ivtVIwRu7CvttpM4wdn448xDTxzqgfVn5OgTXfesDn+gMtTnGrrvXNt 0bAcmpGxOciv8LR5sTfvkV4niYdOCY7K2cUt4PkwIP/eGo/HDFFZpfGjVaBO0bVzb5PC lG7mwmHtmoZYQ11uQsKKxwW0ENKRjw65TBP5lWda51+ZtkLLozGCRbh+ULXadhn8GQYG +wk/SSNR9cXDILSeiloJ4wdnBkl++u23P92oWT5DqXV7i4qMbo73j4o7jhfMHelpmo7D OCEV6Z4hCNq5apGVlgVSPHhf63eCVzCASiE9I6tYv3CsUojEl96g+WP2Js+dTHj747OT WRqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i/ilTMHjD7pndzO8L34GGfxe3eBn4K4fjkK0HYYsKOc=; b=7vHYL9fU9jPGKeqoraJxi4HFKdUkF6aPkyPXU/oPtzuSBiPrFfV9tgW2+sMs97zfld vvAlZpirMt55aUeNhwLbPTa+wjESJ4Gz5YES21aH7qiGOO+XaubmPLQf22FxYjScUABh OBsWWwYT+W/h1M355RjhxNu9Civd5EiraQ442XRCHJsK2d+WX9P6Zv1TwGmDtvNOaGq6 c6mQSg315J0EFOU2rEZfEbZ4kIRChdCM95jYUXblKze5V0cPhMS3k9H43oyoqwz7lx6c dogeTF/ID44dma3/b3Mii8OHR0DF0wqBQcuyjz3RxRyjN5fDaEXft8lWwdDOiKgrmOqh h4cw== X-Gm-Message-State: AOAM532jQKud/i+DPaa6s7cz9iVS4SAzskEA1YHUk2gRnTnOIxnjD/AL aEPYuNBLwuvnc+WrA53fDQYAuQ== X-Received: by 2002:a05:600c:2f81:: with SMTP id t1mr11841116wmn.56.1635243760466; Tue, 26 Oct 2021 03:22:40 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o10sm176035wmr.31.2021.10.26.03.22.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 03:22:39 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1B74E1FF9B; Tue, 26 Oct 2021 11:22:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/28] gitlab-ci: Remove special casing for hexagon testing Date: Tue, 26 Oct 2021 11:22:10 +0100 Message-Id: <20211026102234.3961636-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211026102234.3961636-1-alex.bennee@linaro.org> References: <20211026102234.3961636-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, Richard Henderson , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Now that the hexagon container is using a pre-built toolchain, we do not need to make the build optional. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20211014224435.2539547-5-richard.henderson@linaro.org> --- .gitlab-ci.d/buildtest.yml | 4 ---- .gitlab-ci.d/container-cross.yml | 27 +++------------------------ 2 files changed, 3 insertions(+), 28 deletions(-) -- 2.30.2 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 5c378e35f9..27b9b6be6b 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -249,14 +249,10 @@ build-user-static: CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg -# Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has an optional dependency -# declared. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template needs: job: hexagon-cross-container - optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index a3b5b90552..ed7a849a69 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -47,33 +47,12 @@ armhf-debian-cross-container: variables: NAME: debian-armhf-cross -# We never want to build hexagon in the CI system and by default we -# always want to refer to the master registry where it lives. hexagon-cross-container: - image: docker:stable - stage: containers - rules: - - if: '$CI_PROJECT_NAMESPACE == "qemu-project"' - when: never - - when: always + extends: .container_job_template + stage: containers-layer2 + needs: ['amd64-debian10-container'] variables: NAME: debian-hexagon-cross - GIT_DEPTH: 1 - services: - - docker:dind - before_script: - - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull $COMMON_TAG - - docker tag $COMMON_TAG $TAG - - docker push "$TAG" - after_script: - - docker logout hppa-debian-cross-container: extends: .container_job_template