From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7120476383164235776 X-Received: by 2002:a05:6a00:ac7:b0:528:7acb:e445 with SMTP id c7-20020a056a000ac700b005287acbe445mr12208325pfl.14.1657865123596; Thu, 14 Jul 2022 23:05:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:2189:b0:52a:f8ea:9c27 with SMTP id h9-20020a056a00218900b0052af8ea9c27ls3886650pfi.9.gmail; Thu, 14 Jul 2022 23:05:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tjrgUpQCv/er6oYD3F0ZsHogLSCg8zVubb+NciOAVyUl44r9oll1Hm2tx/MADeQDrr824b X-Received: by 2002:a63:e24e:0:b0:416:1b3c:3de8 with SMTP id y14-20020a63e24e000000b004161b3c3de8mr10782995pgj.120.1657865122696; Thu, 14 Jul 2022 23:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657865122; cv=none; d=google.com; s=arc-20160816; b=FFgE0CQkz28hflwua7rU5041YWfg4vWHoL5NeUeWZGzvQrp+9UBMkbKZ7EDPVPjMvt +k4O8PgbyfVVklFa8Gnr+ts8vjdU3R1B79TYwcE7oTUEisDvtpprIum4Mk+UR6kDMWiv SLXl/SWg7F+u8q2ozX+J5+R5CNYo0T31pXvy/9VZnE/cddPwjNBzfTZWDGoZwQRFWtNS crJ34W9TyAzy313R+T01m738CwPBH3QZ3UU4gWRpH0IwjkuPIaOUARUrxkRV00WsDzbO rt9qDAESs1isgyyQBHKyEhHW2XaVFZqDZKamjlRbIWYLpS0SmONfnSGeJkQ3A+EnhHl6 ykKA== 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=+P2gcNigFSrpz4J8l8V6jMcZqZZDOS6iMdnj7oLL8TY=; b=UbAvOT0oPZA5mEUhkcd6DwEUFrxoLmUiLJU+anXT+o5q8LocWK1lia4sd3OehbYv7B 48mtucQQxGrWW1c6BsKMSoJrdGcEnJoMPelab/5qIQPwSqT2BDyhhHpVcdt+AxaS5hQl aEDpYZK0ErYi/FthwdG5zgnCzCQbuPTdCmVGY951tCdU2YJ7vbGUj+lVnUqnoWAs+mir CfZw7tL8Zbb97mMRLz0PBqJH47RdJM9hEAL8y09GorHzlqXquuZn0QC4i3O6sRMetoZq 21zFE+7L48bmj8Ktazi32g8BOH5H6vwMEmemcCBEMM0HBBinhyQsYfmEyrGlUYHAtpTP BvMg== 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 s14-20020aa78bce000000b00528c2078042si127466pfd.6.2022.07.14.23.05.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jul 2022 23:05:22 -0700 (PDT) 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 (mm-137-75-214-37.mgts.dynamic.pppoe.byfly.by [37.214.75.137] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26F64pLI026837 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Jul 2022 08:05:20 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 17/18] CI: Adopt tests to syntax change Date: Fri, 15 Jul 2022 09:04:41 +0300 Message-Id: <20220715060442.18063-18-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220715060442.18063-1-amikan@ilbers.de> References: <20220715060442.18063-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: JXc7MHBrqbtF 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 dfb0a37..3a2e7e3 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -89,9 +89,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') @@ -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 distro_apt_premir: diff --git a/testsuite/citest.py b/testsuite/citest.py index 6c8eb26..7881330 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -216,7 +216,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