From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7213346705214799872 X-Received: by 2002:a9d:66d1:0:b0:69d:4900:69fa with SMTP id t17-20020a9d66d1000000b0069d490069famr1062531otm.2.1679488156464; Wed, 22 Mar 2023 05:29:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:e142:0:b0:37f:a766:5f32 with SMTP id y63-20020acae142000000b0037fa7665f32ls4669244oig.5.-pod-prod-gmail; Wed, 22 Mar 2023 05:29:15 -0700 (PDT) X-Google-Smtp-Source: AK7set8wq7Luw1kgoObjaRXlMHnd/wiWNEQNgDgTCikc2NH3ppohAhIx4O5s91uvJ5KkYmBQD0zR X-Received: by 2002:aca:1908:0:b0:383:e1f3:fef6 with SMTP id l8-20020aca1908000000b00383e1f3fef6mr855453oii.18.1679488155853; Wed, 22 Mar 2023 05:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679488155; cv=none; d=google.com; s=arc-20160816; b=pvp6g9LDYuPYHerym2w3muGKEB0lUGS27zySAH9nm2+ylIzb8q9qvkGF7EGIpg86oB DbVh86/MuS183pWd3FtsrjCW7IfHFs7IzXCQ1tscoGLqYeEqZJk8uaqyBS4JXlPn/wnz rTon2lDTZxtKHTh7MgTqVX3O5RVY27dOVOn2FU3pYhgtzieuOmWNckGWAGwLwAHBkub0 f6aExf1pgv0R2TEkRGsnZ0tvLlrLg+qS8ttuklPyirKKFMzmb7zFmPt3GDU3BHzayHEh b2QuhPD4Eso6vnfbbjFpNCezg96jMTqkkFjxGqIfwm+v+j98sHuTFmXYjIc4poz7Cx0D MyxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=5zuEGR6ZCbfMtWVOvFDt/dtMDJHH2OQhzaZh6ev5Ves=; b=dgv9CHCDNidRMfJi3axjZ0gLKPb6YYiDDiVbiPw6DVYqNMxU0mUlyfURRD8UmizAOC qANhiSBdC+VggvekNq0pt1111QXojpNs24F+QjV/Vbreez8EN0mMaYmw1uKS9OOec5z1 UgDtjIDKlWaAR5jVUVRCih+6vIijY+FpsaN2rjyECArqt74mYE9c8puzRfTa0lYCXU77 wQS41UX9JfgMr5BldgligjCioK0kjm0d50oiEtrLjZGKIpETFr8iKs1OSk8NtVv/Agrq y9RCpQt7xZjc59R1XYTRmVlTc4XrfeifkXz6tCtdqYcXxYgPptatuxRdlXOn+Tnbk7J9 H9QA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id eh5-20020a056808274500b003869e414f18si1095153oib.4.2023.03.22.05.29.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Mar 2023 05:29:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 32MCTCRd030028 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Mar 2023 13:29:13 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 3/5] gitlab-ci: Switch to `rules` instead of `except` and `only` Date: Wed, 22 Mar 2023 13:29:10 +0100 Message-Id: <20230322122912.5910-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230322122912.5910-1-ubely@ilbers.de> References: <20230322122912.5910-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: IANcdqWkLEnc Filters that use `rules` are more configurable and allow using several rules in the chain. Also, put `image` under `default` section instead of deprecated global declaration, with image version update to the latest one. Signed-off-by: Uladzimir Bely --- .gitlab-ci.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb38be54..b700015c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,5 @@ -image: ghcr.io/siemens/kas/kas-isar:3.0.2 +default: + image: ghcr.io/siemens/kas/kas-isar:3.2.3 variables: GIT_STRATEGY: clone @@ -24,22 +25,22 @@ variables: dev-ci: <<: *common-build - except: - - schedules + rules: + - if: $CI_PIPELINE_SOURCE != 'schedule' script: - scripts/ci_build.sh -T dev fast-ci: <<: *common-build - only: - - schedules + rules: + - if: $CI_PIPELINE_SOURCE == 'schedule' script: - scripts/ci_build.sh -T fast full-ci: <<: *common-build - only: - - schedules + rules: + - if: $CI_PIPELINE_SOURCE == 'schedule' script: - PREVIOUS_SHA="$(cat .CI_COMMIT_SHA || true)" - if [ "$CI_COMMIT_SHA" != "$PREVIOUS_SHA" ]; then -- 2.20.1