From patchwork Mon Mar 25 15:55:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3440 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 25 Mar 2024 16:56:09 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f190.google.com (mail-lj1-f190.google.com [209.85.208.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42PFu87N012045 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 25 Mar 2024 16:56:08 +0100 Received: by mail-lj1-f190.google.com with SMTP id 38308e7fff4ca-2d6b9530792sf26489541fa.2 for ; Mon, 25 Mar 2024 08:56:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711382163; cv=pass; d=google.com; s=arc-20160816; b=jMhOaknr9XOaW/PKNjfItiC7a3IYjGT7d+ktD8Ra81MilQcCdch04+oce0v2VfsdLa 4OaWx9x+ubX1bsSDmPXGOjLojSg0VykOv/iRazwIqt2BTZyvaZAhOs3YHTm6sFgYgDUm bkmYr8xHTMIO3UFhXQN7h3E7wZygixnD0AgcpyoSH5G8d4SZqC/5/RhwhnYWzj3+l6YA vUMgHmTZoReRRg4V2f2jNYyeM/sbYsHuQvzrQzXXji2HOJlYeB0IpqTyx1L1juSN033h GIizU5+xRNhBhXvKi59VJi5hx6V2DzrW3hPm2U08Qqzk6Ex+IztnUROZGcGUUO8Kb8oE dm4w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=4zSe3zc8Y4Jk+KhDHyxrJnZVIRvSwwZpVt9Q8+4zR2g=; fh=xVwXtVJuC4inXqCsrD0rQIxzz2BTpJSapysP9Bdauls=; b=ii2NlAo+2utmCcF4CQGhgpUAZLkixFUfJUkwu6bPIbUsZolKcgKwbEt0LV7KT0PEeo 3c9ld3Wrm96DquMvI06UfDOcdd2QaGr6SkS7vfaJFOiTAWO7Cpbqs8sxtW8Nd9A831hA pgJWwrwrP6XcYartVMG5BnxjVoH7I3g7Xw2KIITyuIhoY75VmgISI+UqwcENE7dFCPhZ yTCXB8qVl5wRiZffKibINqsVbwOlu6+7M41OWN/OP7oSipiOX4L9pfaYd/9OlWlEuN6B HEpQKWbT2lsttkls+I0M4RtBtixg9vFk3Xa/vtWvEOoqU8MdESB+sKL8mqYSmwip/JTT DbxQ==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1711382163; x=1711986963; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=4zSe3zc8Y4Jk+KhDHyxrJnZVIRvSwwZpVt9Q8+4zR2g=; b=HZqnLKKWkeyK6+36CZOeaeTRbHahGeJ3ZkoXHLqkXyF9mfrOzk2WGaLITCn9mjB8s8 GCukU8HMuXUr37t0CjpzeWxUCnLVx7zLzY7e/52VQxVQAVIxkd5k1l/bHHB0/a18tcPk ZB4Eqrgwvfj5C/gUKjVGuQtQCEY0YQXyYT1+anhnOykb5jkPIN3dNNZBZFOtQ9qUk6AT eLSpzNoIW77IRtewgDGsGuwbYxcrIYc/TXM6kelQgrxF4UMf15Q9EPuCGfFnDiLYfuDz RzI6mRWFHKOfv9h5K5+fvpzK1i+wJh02N+SjemvyrPxm7Tv67AZBzGrkVRceKaM1Tm60 SJpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711382163; x=1711986963; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=4zSe3zc8Y4Jk+KhDHyxrJnZVIRvSwwZpVt9Q8+4zR2g=; b=LdlPz2oxddVhjG0bHeph9wUpbluzEX6ziayEwo/RfjoF0/aXJ/wWart+VIfXsPlVvI 17eAhzdXhmbR3WsADTC8xkxxdXNvTMvQUoPUYsT1WEf3ppaj7m/bIWmhCyjRBWOAbMTt gpCNw4FP1sQ5avTRsUJKqX4G9ZXm+zS9C6CQyMK7y8VojTDqwHEQ1zE+lqIcRpMZ/BNd +asm3oRenKnzy7RLrLpSwiFkYq4XVyHsiEjt+pWOjvFPuQWXoo9trSZboNRcIi4HY8q8 grb0M6bVTj85frkNQLD+izy18wciwHly5mFhioMd7lonDB8F/rlNQ9wt2quHY2elaof3 OI0Q== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXXWtSI6RCnyAAVZuyTUyI4a8F9DYwspz5jwz36IgEq6wyHfYsB35rk0HN2EmQxqXtacyVQsOZlMP756vlDQoDxstyy2EY= X-Gm-Message-State: AOJu0YzM/x06Q5SRDnEh6KmuCaYeLdjNzogDeml8mkX2d3b0oQR5a1ru pud830cudgAYOYxAYZVm+l0Cg1HSehIV3xi/7QOU4NJH4h+enjl9EGw= X-Google-Smtp-Source: AGHT+IEqYX1uLuzCGk05IoFnR1fxiEozeQNMuS7BZECMtw0xQR2Zfbv0TzNfZwY0xHjdUJIO5n9Ghw== X-Received: by 2002:a2e:7012:0:b0:2d6:b5da:7868 with SMTP id l18-20020a2e7012000000b002d6b5da7868mr6230597ljc.39.1711382163085; Mon, 25 Mar 2024 08:56:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:81d0:0:b0:2d6:a8d9:a8b7 with SMTP id s16-20020a2e81d0000000b002d6a8d9a8b7ls2679966ljg.1.-pod-prod-05-eu; Mon, 25 Mar 2024 08:56:01 -0700 (PDT) X-Received: by 2002:a05:651c:2ca:b0:2d4:7373:2a5b with SMTP id f10-20020a05651c02ca00b002d473732a5bmr5874356ljo.47.1711382160881; Mon, 25 Mar 2024 08:56:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711382160; cv=none; d=google.com; s=arc-20160816; b=YnBGU9exjGBCgShjeEP/QQ5woNovRALbT4jPIK0wqhJF7siDbrmCYJMLf7W2uMfoc4 qzTLi6T5jtl5yGZYC6D8bcRFZYFBiv3p0QZqUCA/CMNrnZAiXCFN7drgazjGL5NwUe9g I+2ypYAfIWGaJk92lwqTPZi3Rdvu8ibmft70aXZxNcU9bKV7YAVjpuMHVLpqQTUWXyU2 uApiRoR5zVDrtyO5BYTmC6Tgvu2j4D/XTR5tkNMHEC8tvemsBlAkoU+baXJyQuCV44fQ ctvSlAYpNGjzldXN+LNXwiyS/dMj8DoFZzVsSSkxFN9fT2QAiitA43oHLaee3FKim5Hq V4Tg== 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:cc:to:from; bh=7aW+41lctBQUSof1TCCGYlQI/Wb/f0jp00tlYH1Xy2M=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=yyo5p9Rws9YT6y8Dd+SPD5yKc/4/54ORtg95/5k5n/iKLhu46lggHprdpJGqHLh7V5 G0X5q5xpdoN1cJSu3FsZQNckvLI+zxtF+upUOuYpV01Iv5HMEwYQsJ4PWJlKwbQCOwrO g3DQbMqVtsVl5ZrSYaRMyznhBcD136QYDZ6WWB4gD1n0J9ufWBobCgsWylqAPnxmP6K5 D7RaoGJrcJ2COmZmkX90NtNrK8EhJHmRLH7kV4jbndspsPO7d6Vl/xGFrmqJMb88zu64 as5b7jLU505beeYjtd5JvqgPL5c3q9rwYmMVYT1/zsMoN9V10vAb2ZVTLzOxvj9c73Nx DQeQ==; dara=google.com 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e25-20020a2e9859000000b002d46764b564si246279ljj.6.2024.03.25.08.56.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2024 08:56:00 -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; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42PFtnLK011703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 16:55:59 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 11/23] CI: Remove logging hack for job.log Date: Mon, 25 Mar 2024 17:55:28 +0200 Message-Id: <20240325155540.4162990-12-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240325155540.4162990-1-amikan@ilbers.de> References: <20240325155540.4162990-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= As job.log no more store all the output of executed test cases we don't need to inject errors in it. And full.log which contains full output already has errors in it. Signed-off-by: Anton Mikanovich --- testsuite/cibuilder.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d282f8ee..ec2c0044 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -1,6 +1,5 @@ #!/usr/bin/env python3 -import logging import os import pickle import re @@ -29,23 +28,10 @@ DEF_VM_TO_SEC = 600 isar_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) backup_prefix = '.ci-backup' -app_log = logging.getLogger("avocado.app") - class CanBeFinished(Exception): pass class CIBuilder(Test): - def setUp(self): - super(CIBuilder, self).setUp() - job_log = os.path.join(os.path.dirname(self.logdir), '..', 'job.log') - self._file_handler = logging.FileHandler(filename=job_log) - self._file_handler.setLevel(logging.ERROR) - fmt = ('%(asctime)s %(module)-16.16s L%(lineno)-.4d %(' - 'levelname)-5.5s| %(message)s') - formatter = logging.Formatter(fmt=fmt) - self._file_handler.setFormatter(formatter) - app_log.addHandler(self._file_handler) - def init(self, build_dir='build', isar_dir=isar_root): # initialize build_dir and setup environment # needs to run once (per test case) @@ -219,7 +205,7 @@ class CIBuilder(Test): if fd == p1.stdout.fileno(): self.log.info(p1.stdout.readline().rstrip()) if fd == p1.stderr.fileno(): - app_log.error(p1.stderr.readline().rstrip()) + self.log.error(p1.stderr.readline().rstrip()) p1.wait() if p1.returncode: self.fail('Bitbake failed') @@ -504,7 +490,7 @@ BBPATH .= ":${LAYERDIR}"\ self.log.info('Got login prompt') return 0 if fd == p1.stderr.fileno(): - app_log.error(p1.stderr.readline().rstrip()) + self.log.error(p1.stderr.readline().rstrip()) rc = 1 if time.time() > timeout: