From patchwork Thu Oct 14 22:44:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 515770 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp1169392ime; Thu, 14 Oct 2021 15:46:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrwBnTmAe8l5hkfdql6TetmQQRcvmaUuInJ4OjumkvBf/SdbXnquCGU429xWHXrDpMWDIa X-Received: by 2002:a67:1587:: with SMTP id 129mr10525717vsv.23.1634251563750; Thu, 14 Oct 2021 15:46:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634251563; cv=none; d=google.com; s=arc-20160816; b=rX/tmOufKRrgM90SpQQCWNnSlzs3CC28YYBpGdpp6ehdRJ0hmMQPgpd2Oj7T3y0Kwc fwYBEUPthk80FZPtfF2JfFbyIiQ4aoS9XAK3FYD0HfoBqqzjQ4D36ev0/CYBslLHGzJO N3LgjOuJPMrd9gsUXA+M4lw3HuNf7s/L5eaa4ZZ7RkG6mvvEef7D1MkeO9p3ZomYGyED W3L+wO/68ks9IiLOiF+bgzHIz1QTXHIeOv9nmxnIZfCo2vx5viSj0ts9sekvO6mesl0n yyStHybGPovrHVx7zFT8+qj/nsLRSNzCrKEs8jJYy9bBpfqWySn1/8QSdagcuWRdsNuU eARg== 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=ckbjJRykTA5MsIBCGHObS6KYVtTnOmvV9h1EyLaQrJ8=; b=kzrRvR9TVUMsD/OfcGQC/c0y0Yym8+S6mSOsLPapZXOw971IxUrtFv+cTKld9LtHZW DdcYixo0NuaWRQvCP5u02il5mCqD8lE11CpzQ8IkL4e+YAFxvWDwRJB36bXKZdSG6zQi MtyvWi/cSDKD01XMDjTZZBWB2/c41EYR5Lw3kJfY4Nsi6TE3YmP1vIMhySSaA8QuomyR VkF0yr+otxROs+S/baxyubnq2VzfYqMMUaWYSICXc/NQ7Zle9tVKqviF5YVUdfRWY4ye o0TJgV483NuqdlyYbULeS7aXuAgEE8kW4hWuzhmOwodt8I/cZ9la5xkYPyxrojaPz0j7 EGcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M4zNHK7P; 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=pass (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 g25si4459453uaq.71.2021.10.14.15.46.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Oct 2021 15:46: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=pass header.i=@linaro.org header.s=google header.b=M4zNHK7P; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mb9UB-0002wD-5N for patch@linaro.org; Thu, 14 Oct 2021 18:46:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mb9Sw-0002tQ-0p for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:46 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:43940) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mb9St-0004ME-Lj for qemu-devel@nongnu.org; Thu, 14 Oct 2021 18:44:45 -0400 Received: by mail-pl1-x634.google.com with SMTP id y1so5141175plk.10 for ; Thu, 14 Oct 2021 15:44:43 -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=ckbjJRykTA5MsIBCGHObS6KYVtTnOmvV9h1EyLaQrJ8=; b=M4zNHK7PUgK+6wNAImdnQygx1qXMyQpAGaT8pPZvSE6SFkGJ7UQWYPrpKZKw1q1UFv xMexGC3wZAAee9xebS8HVS+52PknmTT4Lpwdv7ePQ9BIaekcnny1nxWIbgVO38EDoLuL jTsO1iYRE/oZew4qpcgSIR9XUqYJdCGfxz4gAP+67zDl//b0yWaQEO2f1WNJ0yJMw0WG yLWWs7E9pSzGTf8DpCY1Tkta6z1TFn4YM9JWuYDUpVIjJ+Q+fZX5ZiBN6h0BmGIMTsoc PNKSoa8cQP9CT2JcW20zq+zprFyqXwEltbHrhJLuYh56vh9wUuF9RTJ+pL2xxtR1D7ns gcbw== 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=ckbjJRykTA5MsIBCGHObS6KYVtTnOmvV9h1EyLaQrJ8=; b=4fsk+YFUbDp00ZWC0g8bp+PmocVJvEDl2UVMxT3R0TkS9g4hVuo1PS1aMs2ut48CXX sNXvrU0fWtm5mOhdReXpfFwDnckpryvGRuVAN2x49Bn/m3cMi9boHU2txRs0DEYhsbUW QIRFsd92RlzyXxrr9zzLN+8XD1WpcxYUtZ8mGSIlVAvM6LH9C+Ap//UUTffP9hb7b3fK hbM71tU51ojOyaARf9eHBUdsY4CggLULXwhwS0O5RQeqiLYMYH2Wjgh0def1nnXs2z5C f+D5wheASCV6SyMbGzwjVGdeF46zQLUKXBUiyhFPUI94VQightedmKZs6LN2TVrmKe/N +9vg== X-Gm-Message-State: AOAM530sK3Lf//rWxhxi4X/s+p8IggpeC2Ie4owp0np5TcK4vkQ1d/is NGBuq8MGtBtw4fF4JkFAm8lIxPMl6ul8iw== X-Received: by 2002:a17:90a:9404:: with SMTP id r4mr9194084pjo.240.1634251482254; Thu, 14 Oct 2021 15:44:42 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id m10sm9506208pjs.21.2021.10.14.15.44.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 15:44:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/7] gitlab-ci: Remove special casing for hexagon testing Date: Thu, 14 Oct 2021 15:44:32 -0700 Message-Id: <20211014224435.2539547-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211014224435.2539547-1-richard.henderson@linaro.org> References: <20211014224435.2539547-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- .gitlab-ci.d/buildtest.yml | 4 ---- .gitlab-ci.d/container-cross.yml | 27 +++------------------------ 2 files changed, 3 insertions(+), 28 deletions(-) -- 2.25.1 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