From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:ab0:664b:0:b0:50d:e449:78aa with SMTP id b11-20020ab0664b000000b0050de44978aamr161661uaq.2.1672124472368; Mon, 26 Dec 2022 23:01:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1f:988a:0:b0:3b4:4e41:3c89 with SMTP id a132-20020a1f988a000000b003b44e413c89ls1675480vke.6.-pod-prod-gmail; Mon, 26 Dec 2022 23:01:11 -0800 (PST) X-Google-Smtp-Source: AMrXdXusqvW96ES+0eih+es9HlarabkOwJsm7HHyT+lnvERZ1XLGNzKxjPgpsWGqj9oXZF+yLKXd X-Received: by 2002:a1f:ad16:0:b0:3be:2144:6a1d with SMTP id w22-20020a1fad16000000b003be21446a1dmr8446301vke.4.1672124471756; Mon, 26 Dec 2022 23:01:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672124471; cv=none; d=google.com; s=arc-20160816; b=nQEKfhW2tyPSKjgLwLO9pQCyLuvmr5NLTLfD+SA/AdygaPbxx4r4C9xTgRTTFX/Lj7 pNgW3uJI8h8sRHHWu32m61dfiwzABie33MfDfsQptI2LXYuK2vxA3CZSn+VZ1gAtddk6 vfgggqCQiYOe8b29bJB/40P7jbblN3YizUOjywXVV+CdpineU9ZEZvDlvfUoHuANSwV4 vMa/vzMefdHz46u3slmG5Pr7o+6I2mNaUMXHJfGJ6nZSakY+UuNjUu4kZKlTMhpuXIU2 9JDZc4avkCiYEpDthEFfJwSjEGr2AI7+IgSI6qK6oC4gyMfZYqqZdzwyAldhDhKC0VBY YAJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=joeIAMs1q7OzLPDHCBQemIF289B9vMlxJeBUScEcRTU=; b=Y2RJ5IH2moGBuJtmIwxgTbICVzNtPkicp9BoYdUO2KxZRYoMRZi4rwzruw2WmYPFs7 faMxkYKAEtq+BrMbz4MjmNRtTYZe3Z8f1brWtc9ohqEo+Ldt08oidoRQDupNWVSwjLRN cPqXP+e/JoVFl+1j5AdgIi6CF3mB3/imnAWDeovanNxOAyib6RgVuO2gqP5XVyhM5nUU fo/RjGSWqpr4PwAG0RjlURzu4g/iSUNidFNbyb2oBuzLkjRcHSlkuFxLMSydgUT+ikmn ep8gDLMkabxeOVr9f9RcxznBj4xlEMjCTemA+53RihuWm5ByXnjLRU2hs4WYXJLDZ2tq Chkw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b192-20020a1f1bc9000000b003bc9f1cd034si893934vkb.3.2022.12.26.23.01.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Dec 2022 23:01:11 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from alena-nb.promwad.com ([193.228.193.9]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BR70jA1030666 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 27 Dec 2022 08:01:09 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v7 16/20] CI: adapt tests to syntax change Date: Tue, 27 Dec 2022 10:00:35 +0300 Message-Id: <20221227070039.23496-17-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221227070039.23496-1-amikan@ilbers.de> References: <20221227070039.23496-1-amikan@ilbers.de> 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: ZREEZHkWtyvm Change override syntax inside test cases. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 6 +++--- testsuite/citest.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 39cbd2e9..bc800787 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -90,8 +90,8 @@ class CIBuilder(Test): # write ci_build.conf with open(self.build_dir + '/conf/ci_build.conf', 'w') as f: if compat_arch: - f.write('ISAR_ENABLE_COMPAT_ARCH_amd64 = "1"\n') - f.write('ISAR_ENABLE_COMPAT_ARCH_arm64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') f.write('IMAGE_INSTALL += "kselftest"\n') if cross: f.write('ISAR_CROSS_COMPILE = "1"\n') @@ -102,7 +102,7 @@ class CIBuilder(Test): f.write('BB_NO_NETWORK = "1"\n') if container: f.write('SDK_FORMATS = "docker-archive"\n') - f.write('IMAGE_INSTALL_remove = "example-module-${KERNEL_NAME} enable-fsck"\n') + f.write('IMAGE_INSTALL:remove = "example-module-${KERNEL_NAME} enable-fsck"\n') if gpg_pub_key: f.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n') if wic_deploy_parts: diff --git a/testsuite/citest.py b/testsuite/citest.py index 7aa1e6b5..2b6c0b29 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -239,7 +239,7 @@ class RebuildTest(CIBaseTest): self.backupfile(dpkgbase_file) with open(dpkgbase_file, 'a') as file: - file.write('do_fetch_append() {\n\n}') + file.write('do_fetch:append() {\n\n}') try: self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base', debsrc_cache=True) -- 2.17.1