From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7172560304523444224 X-Received: by 2002:a05:6871:b09:b0:142:9243:fd8b with SMTP id fq9-20020a0568710b0900b001429243fd8bmr248122oab.117.1670936060396; Tue, 13 Dec 2022 04:54:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:7885:b0:143:86b4:f098 with SMTP id hc5-20020a056870788500b0014386b4f098ls5372783oab.11.-pod-prod-gmail; Tue, 13 Dec 2022 04:54:20 -0800 (PST) X-Google-Smtp-Source: AA0mqf6UGa1Ex5/9tWCAJTz/DOz3/idBtAxxwaR3B++t/ENjzGMGTRGrjz8FlkxbFIgfHck4lhmC X-Received: by 2002:a05:6871:460d:b0:144:1e52:4cba with SMTP id nf13-20020a056871460d00b001441e524cbamr8947501oab.12.1670936059881; Tue, 13 Dec 2022 04:54:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670936059; cv=none; d=google.com; s=arc-20160816; b=ZPY3Cc7E5ctqPe8HkDqRR7yimDxm0fo52HkO2q2Sif4LQvldlVbfFUTRAeWypGBOIN bR5Nr98+KgPXRUPKScXdhBn4tYPmF6yazqFiZ+cukGSSpQFGvKCdkVOx56kPRP8pSo+k /gCGs9aJ/Q3se+gVDkmhpqSdZlDt3l39xRziOEzU+XAZQ7BmnVdGx2XNoiQGsOW1svh4 pGgcWvjM/jQr0DKVkFJUunq5VgkTpMs0zXXPMpqDon0yLIddvttPwB+E9H0M8c9og6V2 unktejPFpMmL5we5hSeKr54R//YXuB5EX342z7wE0IsDpYNhdS15YgImJtreoeQS6q1Z G5og== 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=obLzT14xRM/pzTETtSOEE6JMcQ6urI5cJYsTQ6SgH94=; b=th+kkMI8+mvEriLtTM6l9tZjg8he9YZ7/Z99ZZlrq1E7wbnB6uUFfIlJLKQVNwUVaF 3s/eGcSYzfvWjWB2VtvwQgixdxxQ8YN3hvWSCQlNecSbyCZ7J4IKanTpDwRRc9LcUK+e 5nHYCGMEdRqNwCvk+Lermpl1U2+IYlWIfFvC5Sktx7IjKK4Zo1S20TDSfn1PPcOAqtmw A/fMD+3UTBztbt0c752a65ZcLc04kbzUh5jdDUq097wfj3rSgjwimL72N811kXCOzDgx 0F+isSmfy40IJ1+Lz5EIafS0pp2Tbw5MDwOthGPPMERKwJizCtv6v4OM4J1sji+cGhEg 5Nmw== 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 u19-20020a056871009300b001480308ea6csi376859oaa.0.2022.12.13.04.54.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Dec 2022 04:54:19 -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 ([194.49.52.147]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 2BDCrDuj001200 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 13:54:16 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v6 17/21] CI: Adopt tests to syntax change Date: Tue, 13 Dec 2022 15:53:01 +0300 Message-Id: <20221213125305.10984-18-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221213125305.10984-1-amikan@ilbers.de> References: <20221213125305.10984-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: UNY4s49W/LF1 Change override syntax inside test cases. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 8 ++++---- testsuite/citest.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d5c83b22..bd7938f0 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -90,9 +90,9 @@ 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_debian-stretch_amd64 = "0"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:amd64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:arm64 = "1"\n') + f.write('ISAR_ENABLE_COMPAT_ARCH:debian-stretch:amd64 = "0"\n') f.write('IMAGE_INSTALL += "kselftest"\n') if cross: f.write('ISAR_CROSS_COMPILE = "1"\n') @@ -103,7 +103,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 d4fb177f..caf8fd29 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -240,7 +240,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