From nobody Fri May 17 10:44:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621949069; cv=none; d=zohomail.com; s=zohoarc; b=RTNc1TEDlADQ3h3My8r6z7HuRVP66vKzWxMmAqfgM8Kpm+tEtw27IQnQllzwVf7LJWbCBi/AKs65K1NW2kUyEf4+GwtrZzYxUQ6vGxM1Srfd1wgFs6vTYz65G0Hz+3eQ9e6FDmIcict5LOIPlRoDqEHwYqta88+LuEAyxKO9rwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621949069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fimz6uqMhxdm+Pr3YIAfXrQRcWggaG6gew/x6zwC65o=; b=mnmXVaI0ZzTwWm61Z6JrGgjwemlUzoyu3WfX5wIb3Jfuacd0l2R2cnSdG4O3vMPJzv1pgBVcr1JMG7cpNW9He0BIj+5trzi2GIx1+/rijXuRsVuAPHZUTEOZ20HaXjH3Py1PT9VOeOHpHLkUDOu469AZvr/xCunKsPWjcnNf83g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1621949069011706.1187101352059; Tue, 25 May 2021 06:24:29 -0700 (PDT) Received: by mail-wm1-f50.google.com with SMTP id z19-20020a7bc7d30000b029017521c1fb75so3456028wmk.0 for ; Tue, 25 May 2021 06:24:27 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id b10sm18949233wrr.27.2021.05.25.06.24.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:24:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fimz6uqMhxdm+Pr3YIAfXrQRcWggaG6gew/x6zwC65o=; b=ATxvSsllwughOtUWnx2r6T5kHXjAsSHexBzaqZap6fAK1lJ1BSQl6whhqlAZ2VNKaQ gpSE7s5EIImKxj+u/i53Y4IelwYzRNSALAop77eh/wlru37wJtvXgjq7RnwgaqroKGyl P0b96hklSEWmymwlhX4sg+U6RMJHAAJX/jHdl+WYAPgBgue4pmojRlIz3O1uUImkjwhB fCX8r6be1pF9toEbrebHJWss5A/3wME4Y9RRJ6i7FMz+aUTj3gjOJffzHfVGhE+sPRl2 HufBKmHyWRqULVZief/ETjC6aUYMOnAWkYUH7QrHymGiOyJYd5uZ5zkORgcPTImVe3LW BCkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Fimz6uqMhxdm+Pr3YIAfXrQRcWggaG6gew/x6zwC65o=; b=dq1fGpOAew+1U0dIS7O3Q1pCJhCWmommiMXBSQH1yckPR9YBN0b+G9SMnmbWepkWwl abgPhPeO7jyXFezp2ZvKE4TLT4vjnsXxUzCrLH6r2p9cOK4MDeDxAh3hM4VBZOxwTWrv Vmzj8AcJnAhHU3krmxUhobiDrZHWyN4UhqUmq7Xz82n04PuN3ZUn6I7cjIGVS2Evarmc xRek0dNwWsC+dPr2rw/8Yh/CyAaeFJ/BuzCLQsMrFK0zO5Y+zirzjcuZ+mNiHmFcr7bs XFhOsaNALDO69dG/YGTygaNi9/npplYCMSvpwvtt7WxF6T5EMyahcXghGiJ/CmGy47YN 7fKA== X-Gm-Message-State: AOAM530fGCy2BFZGAc3GoS+sJn01R+bORYFOM85QGagadztERohhTsJZ QnBQhI6TIPxx4lRgMeSHgSA= X-Google-Smtp-Source: ABdhPJyKZr09aMU0stnqSTXvYxEHvSqupg/tLpZ7gqeLy+yEvw/wCeZxBND24a4Tj6t39q3mGCUopA== X-Received: by 2002:a1c:638b:: with SMTP id x133mr3919599wmb.182.1621949066326; Tue, 25 May 2021 06:24:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] !fixup gitlab: add special rule for the hexagon container Date: Tue, 25 May 2021 15:24:17 +0200 Message-Id: <20210525132418.4133235-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525132418.4133235-1-f4bug@amsat.org> References: <20210525132418.4133235-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Make the build-user-hexagon -> hexagon-cross-container optional to avoid on mainstream CI [*]: 'build-user-hexagon' job needs 'hexagon-cross-container' job but it was not added to the pipeline [*] https://gitlab.com/qemu-project/qemu/-/pipelines/309137207 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.d/containers.yml | 7 ++++--- .gitlab-ci.yml | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 088c7e68c3b..59803453d50 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -106,9 +106,6 @@ armhf-debian-cross-container: hexagon-cross-container: image: docker:stable stage: containers - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' variables: NAME: debian-hexagon-cross GIT_DEPTH: 1 @@ -127,6 +124,10 @@ hexagon-cross-container: - docker push "$TAG" after_script: - docker logout + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project"' + when: never + - when: on_success =20 hppa-debian-cross-container: extends: .container_job_template diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2f929c758b..2b89143f81f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -417,12 +417,14 @@ build-user-static: MAKE_CHECK_ARGS: check-tcg =20 # 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 no dependency -# declared. The image is manually uploaded. +# on the CI system to build it. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template needs: - job: hexagon-cross-container + - job: hexagon-cross-container + # Only forks have the hexagon-cross-container job, + # keep it optional for mainstream. + optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user --=20 2.26.3 From nobody Fri May 17 10:44:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1621949072; cv=none; d=zohomail.com; s=zohoarc; b=h7ZIkVdVJcqsU4IxzN1D1o3jugK5A1jAMU40pJcHQkFxcMIoIFfbEEaXVrBEF7lHm5rfMHodv0dAgH9ur5ZG4lcvGzBMPdmK6X/Y/3i3bkLKe7Pnmo//AI3pDfFF5s7CAlPt7JOsri8qUQKQZUpBqK9bnxjeoixNl4URku/jwBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621949072; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hcKUI6D/hdA20ddiBr+GZjA09YdghIV+DGZJsB1vITM=; b=NljZ5fisrAfwmRVVt4MO2gAsaAaUKYgwieHi1TCvEsue87v/2LsFBfRrt4VBlb60I2DPbr5ldPP3f6LmQC1Xsoje/LUKS1Y8BoKsSrMIvTaYBOZWh6fOtGTtjmVY3U0MeLk8ufyX32eYxqCZzDF2d/PaDX7eIi+3J/jXyPBFVaY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1621949072734278.0508481980812; Tue, 25 May 2021 06:24:32 -0700 (PDT) Received: by mail-wr1-f46.google.com with SMTP id q5so32220426wrs.4 for ; Tue, 25 May 2021 06:24:32 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (31.red-83-51-215.dynamicip.rima-tde.net. [83.51.215.31]) by smtp.gmail.com with ESMTPSA id c6sm16472031wru.50.2021.05.25.06.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 06:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hcKUI6D/hdA20ddiBr+GZjA09YdghIV+DGZJsB1vITM=; b=Wav52WKIMC1sVCv2td8YmLwj/GJJGWTxrRz2rbd+80JGh6IxYUZx/plzp7Q5oqsJDb ftrVhMwrI9Duzyvc7Ji1r19CLBM2SbMJKQQ2LAc/wFGsJWT/fb/CPJkJ/MdIR1wh+Ggg kVbe4FXLDSFU+nbRdPslwxObELTTwtI/y2RzdascUxXmmBpfhktl+JPOvGS4EnW54E3Q QhykZnFkFDnZ0QYRT3dK6lHO6q60XWL/KbQ1tOGp0cZuAQwenk2LAmLnq3vUv8s8UMHa 7GHv8RLF4GJmoGqXsf8Ckw1NnMXNMvkIQ3DaTde/73lC6YXsRhiVhBIwgfgOkb5vdIr8 XByg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hcKUI6D/hdA20ddiBr+GZjA09YdghIV+DGZJsB1vITM=; b=tF0za9CUFbxwlHBTk3LTk3zOfyKxiYuAC7gDH02uatVsxnWSprh5i02KixraCGN89b 1lmPBhNSlo+qns0wPWJSjYmZCYOHifbcPrjEDQXTGApCkpOzfloXAXd5bJdwFadCL5QH 4GpO2ysyNWCTTc7ozmaKm20rYrWUNNRr88XiYP2rUyIYoWl37CJ+m337eqNajGQSChtm KLLndYOPRYibzAtZ8ehWQeX8R9sDCTqG3E7WRe1YmVrjbUe+BOLx3s/sasibhYcY1e+z hopcr3bPnyYQzsiJTU087BJ0q43Gp6A+HpYrsaxlePhZi6dYg+4fLXpVpaEe5/dv9Cvk VIUw== X-Gm-Message-State: AOAM532OrsnWyh2sZoTo4aoSP+B0gV6VlOzaobJe9QHKYvcwoHXQfVBH TZ1b2+Cvnx69NvY+43xqyfw= X-Google-Smtp-Source: ABdhPJwMXjmo3s5RYt62xtTow6dE+dytW+nLPns6nDA7NJyXn3V0uAzJogVcDTMagRxqGCKy6C2EaA== X-Received: by 2002:adf:ee44:: with SMTP id w4mr26356559wro.415.1621949071016; Tue, 25 May 2021 06:24:31 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Wainer dos Santos Moschetta , Willian Rampazzo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax Date: Tue, 25 May 2021 15:24:18 +0200 Message-Id: <20210525132418.4133235-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210525132418.4133235-1-f4bug@amsat.org> References: <20210525132418.4133235-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Per GitLab documentation [*]: "rules replaces only/except and they can=E2=80=99t be used together in the same job." Since the 'rules' syntax is more powerful and we are already using it, convert the check-dco/check-patch jobs so no job use the 'only/ except' syntax. [*] https://docs.gitlab.com/ee/ci/yaml/#rules Inspired-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo --- .gitlab-ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b89143f81f..83e077d095c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -786,12 +786,13 @@ check-patch: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-patch.py - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' variables: GIT_DEPTH: 1000 - allow_failure: true + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D=3D "master"' + when: never + - when: on_success + allow_failure: true =20 check-dco: stage: build @@ -799,11 +800,12 @@ check-dco: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-dco.py - except: - variables: - - $CI_PROJECT_NAMESPACE =3D=3D 'qemu-project' && $CI_COMMIT_BRANCH = =3D=3D 'master' variables: GIT_DEPTH: 1000 + rules: + - if: '$CI_PROJECT_NAMESPACE =3D=3D "qemu-project" && $CI_COMMIT_BRANC= H =3D=3D "master"' + when: never + - when: on_success =20 build-libvhost-user: stage: build --=20 2.26.3