From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7213346705214799872 X-Received: by 2002:a17:90a:5d97:b0:23f:6c5:8af2 with SMTP id t23-20020a17090a5d9700b0023f06c58af2mr1062039pji.2.1679488157115; Wed, 22 Mar 2023 05:29:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:3c52:b0:23d:3f08:4703 with SMTP id pm18-20020a17090b3c5200b0023d3f084703ls11719130pjb.1.-pod-canary-gmail; Wed, 22 Mar 2023 05:29:16 -0700 (PDT) X-Google-Smtp-Source: AK7set/nRl02FqO0b69wqkUiGSYs4OaIimbCyNwpgfid8hLKa3uo2gJYSw5dHojUuy4pK9qV+rJh X-Received: by 2002:a17:902:c44b:b0:1a1:b506:6fe with SMTP id m11-20020a170902c44b00b001a1b50606femr1948648plm.29.1679488156196; Wed, 22 Mar 2023 05:29:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679488156; cv=none; d=google.com; s=arc-20160816; b=jSeYJpJRRUCB1xROe3CuKbUbYxp4lWFLpB9bT1GF/MR/O37H0hBMukpuiP4o54ro2L AqogQi1ozoiqvHnTk7J3Cwc6LIIKCCyazlb0bJCsENvoeguR1h0BqP+N97EWRmvmUcUo xdwdREtsyEu0YSrQ7Ik9YO3R4+BxzEuwUmIyMkJOkNrYhHfIkIb738/OXNEf+Ki+0Tty c6Gur1oG5tXysKcBsFCYcgD1WnUnHueOs/+JJqSybdIfWa6zUy8N5UBa4vXRArGVsAwm cn6P5UZpXQf8GfesoOMk584edn/hMtHdAqbOTSxWIvjj9Kw1cN9i697tN1CfljewcUAH WJeg== 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=puXShSftc7m5skCz9WIHOeeVH+LQsrW8e74bShogJ/nhGw6Za9D3C0CjXhjkt89z13 pk6+BnTDSgtkHL93w+IqVbToA82MGkxvcEb9lafJcNQXemd5yB+nfZOA6wVbbwLTJ7uy XZPFzB1Ivd7jDlfUQNTQWgkKpw82wpCwD00o2BQiAQg5zdiHWqanQWTv6vTOmn0MECR/ xNZhFgNZmL+9k3LuPlTdkF0A+inrRlTZE+Ixuf9E+VEV3Q/+RHOf7LteG4r7r2C9TRo8 IY9F5ywBEnJAaUBs8wPknzIi5WtCw1L5tM02wQH2nsjqPFaPquZ7SxQi1WD7dXR2bTw9 PfzQ== 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 e12-20020a170902b78c00b0018712ccd6e0si451916pls.2.2023.03.22.05.29.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Mar 2023 05:29:16 -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 32MCTCRf030028 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 22 Mar 2023 13:29:14 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 5/5] gitlab-ci.yml: Add jobs that run with custom docker-isar image Date: Wed, 22 Mar 2023 13:29:12 +0100 Message-Id: <20230322122912.5910-6-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: UdIg3j++NG/J 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