From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7237357611038801920 X-Received: by 2002:a92:d20b:0:b0:33a:adaa:d6d1 with SMTP id y11-20020a92d20b000000b0033aadaad6d1mr627554ily.15.1685078631607; Thu, 25 May 2023 22:23:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:1bc3:b0:331:1905:987d with SMTP id x3-20020a056e021bc300b003311905987dls398929ilv.0.-pod-prod-01-us; Thu, 25 May 2023 22:23:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6MBnlQ8dzVT7FqM5LdPGbkDTt/dGno6PPPUjzU6HNJA/U+0t3/BKBNzKnXe1+qAzRkyjo+ X-Received: by 2002:a92:d0c1:0:b0:338:2af:836a with SMTP id y1-20020a92d0c1000000b0033802af836amr761520ila.16.1685078630989; Thu, 25 May 2023 22:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685078630; cv=none; d=google.com; s=arc-20160816; b=YCVFGnjCOlNdJvq7SIykSVl8pfF3b9E9tnhHenrimzjFHjuZcCFa5V0X4XDnXNefJa yGmmG06Khng2unphk5ZkOZraQzQ0J2OnoCzPp6t11MZKd9zK3fXGojEEhE9gdbs2JIBG Q4PAAuCoPte4uroLV+XFQxN4CdyHamuVLKxIUnpSBivEWqSJHKaW8hdxcwukg9oYAg0c wJgZlwywVLF3Y4jIEioyzgUg/6f74rEieTJkf7IedrCRO95srqZenjqlvmCOFmuzPMXa +eei2wrbMK64EsKdE0Wt5vXfEj6yTml4BrobPmdOBzbDlYhc1OJ+gsZVBzTIdRrO6vlG bdtw== 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=9Te5NP2UU1r74UFmFD198eGkqaRxjt0DOm1Udq7vKn8=; b=yCDSbzQDP+YR8scjJaSH5NezaDwR+kOFOh9nKCh03uJoM0KLzsPJ8nXX9mTUvDOEap AbGKIyJfSpu3uRpZYwimM/1FZKeEy6jRgrNVARlh343n4lHA81w8qctJb7e8313pxdFL QTQkA6g3SzvR8vPuuBUKm4N0w5zrF6frKC2epqYPq4iXiOUlfEatGVj0MD3DIELqRHKt hpY2yzr30mmKvw3Ogqx8u4q/r8ef4foQLsaVloFJcvJhzLg9GOhF06QJrHTK/hjYlr5r XTojcu1jzBl2iYkh54Jo0zceVVaa9TZLttcHL5ETBRqA5SbIF+T1sa4+StjrpjLOHXK+ /CYw== 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 t14-20020a02ccae000000b0041ab227e6b3si342956jap.5.2023.05.25.22.23.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 May 2023 22:23:50 -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 34Q5Ngol012874 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 26 May 2023 07:23:44 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 5/5] gitlab-ci.yml: Add jobs that run with custom docker-isar image Date: Fri, 26 May 2023 07:23:42 +0200 Message-Id: <20230526052342.7945-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230526052342.7945-1-ubely@ilbers.de> References: <20230526052342.7945-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: YpMtqlYUrWe5 This adds possibility to select between `kas-isar` image for building the project and `docker-isar` one. By default, if variable `IMAGE` is not set in schedule properties, we continue using `kas-isar`. Specifying `IMAGE = docker-isar` swtiches CI to `docker-isar` image that has "avocado" and "qemu-system" packages preinstalled. Signed-off-by: Uladzimir Bely --- .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5117519a..7e28a234 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,9 +23,28 @@ variables: when: always expire_in: 1 week + +.docker-isar: &docker-isar + image: ghcr.io/ilbers/docker-isar:3.2.3 + + +.use-default-image: + rules: + - &use-default-image + if: $IMAGE + when: never + +.use-docker-isar-image: + rules: + - &use-docker-isar-image + if: $IMAGE != 'docker-isar' + when: never + + dev-ci: <<: *common-build rules: + - *use-default-image - if: $TESTSUITE == 'dev' || $CI_PIPELINE_SOURCE != 'schedule' script: - scripts/ci_build.sh -T dev @@ -33,6 +52,7 @@ dev-ci: fast-ci: <<: *common-build rules: + - *use-default-image - if: $TESTSUITE == 'fast' script: - scripts/ci_build.sh -T fast @@ -40,6 +60,7 @@ fast-ci: full-ci: <<: *common-build rules: + - *use-default-image - if: $TESTSUITE == null && $CI_PIPELINE_SOURCE == 'schedule' - if: $TESTSUITE == 'full' script: @@ -52,3 +73,31 @@ full-ci: key: "$CI_COMMIT_REF_SLUG" paths: - .CI_COMMIT_SHA + + +dev-ci-isar: + <<: *docker-isar + <<: *common-build + rules: + - *use-docker-isar-image + - if: $TESTSUITE == 'dev' + script: + - scripts/ci_build.sh -T dev + +fast-ci-isar: + <<: *docker-isar + <<: *common-build + rules: + - *use-docker-isar-image + - if: $TESTSUITE == 'fast' + script: + - scripts/ci_build.sh -T fast + +full-ci-isar: + <<: *docker-isar + <<: *common-build + rules: + - *use-docker-isar-image + - if: $TESTSUITE == 'full' + script: + - scripts/ci_build.sh -T full -- 2.20.1