From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7350330382288420864 X-Received: by 2002:a19:5e47:0:b0:513:cbde:8764 with SMTP id z7-20020a195e47000000b00513cbde8764mr168166lfi.57.1711382177757; Mon, 25 Mar 2024 08:56:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:39cd:b0:513:a093:d898 with SMTP id k13-20020a05651239cd00b00513a093d898ls189910lfu.0.-pod-prod-01-eu; Mon, 25 Mar 2024 08:56:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHB2LUSXMbWQvqF+6TWLUMAO51wYSBULR5799czYqxjfoYVJYDG9ZnWfJroF5tS2iY+ZUWp X-Received: by 2002:ac2:5e74:0:b0:515:a8f0:221 with SMTP id a20-20020ac25e74000000b00515a8f00221mr202868lfr.37.1711382175540; Mon, 25 Mar 2024 08:56:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711382175; cv=none; d=google.com; s=arc-20160816; b=L2yzkV2ShArd471XVtXbcA3hEPYEzecAb/mWORTPUnr/SCScLW1HsKITasRhNY1QPC 7EVels4dcG52zHZ4bjqSbzoePUEPi9QbMYt5WkP/3LCW4scIKFz5sNM5tH+YnqKKKEzq X/CGYEqfejKvHBWpEpagHWijcrwiztSM8GmtHRUx5Yo6a50HBu/2AJwr1kiz9W8RlfTI uXpDM22Mi8JVQMyTOUIiRBRE5DUZoTth5LCqq8ZIEdOTeMo2+2kuV1epqO5T0DuLbAmM L4Yig8KGVk4ZQ8q0NMcKRLkMDwqED4n0NLMg2oYcJojM5KILak3zPHxsA1xh07GzfKQx swtg== 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=UGFSy26iE8+wKEVHa8w/g3U96C1w1b6Hi1u6b5wzq1w=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=gMHhm9/efPCwvszm0wu4ViPE97yKyqikPSRkN9quf5r92aOe1D1uKmho8EDL1E+g+C hzR8/bCi0FotEUZcgzDHVCk/s7o+nnrmIlUxiTyBH45yLSZJKaXeWSHCTVhu6N2YuCyG 9W2a9o1sfGBROq3dzQ7obXOqlU8oYk18gy8VPEc5Z7qYb/u5sqBs1JpqhY291y9hyZwV Ri2TTrk4pRnp6Ij88xAH+ptczHXB2U/LjSTCTryoCI4hdio20q6/5Nh3Wb3r2Xyu+hrQ Xb0Ysutwx3+ei7/lXR2+Qho61RrOgMFA3/SJS/MQ0oxHJ/GVbe6jEZF6OwNqx+Sjlppk 9klA==; 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 Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id o22-20020a198c16000000b00513c1ff7958si313595lfd.1.2024.03.25.08.56.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Mar 2024 08:56:15 -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 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 42PFtnLU011703 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 Mar 2024 16:56:14 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 21/23] CI: Create avocado.conf inside build_dir Date: Mon, 25 Mar 2024 17:55:38 +0200 Message-Id: <20240325155540.4162990-22-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 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: qSzT38VKg6nT To be sure all outputs are located inside it. Also do not resolve symbolic links to keep original path naming. Signed-off-by: Anton Mikanovich --- scripts/ci_build.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 7e841886..cd4c8960 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -132,13 +132,13 @@ if echo "$TAGS" | grep -Fqive "-startvm"; then fi # Provide working path -mkdir -p .config/avocado -cat < .config/avocado/avocado.conf +mkdir -p "${BASE_DIR}" +cat < "${BASE_DIR}/avocado.conf" [datadir.paths] -base_dir = $(realpath "${BASE_DIR}")/ -test_dir = $(realpath "${BASE_DIR}")/tests -data_dir = $(realpath "${BASE_DIR}")/data -logs_dir = $(realpath "${BASE_DIR}")/job-results +base_dir = $(realpath -s "${BASE_DIR}")/ +test_dir = $(realpath -s "${BASE_DIR}")/tests +data_dir = $(realpath -s "${BASE_DIR}")/data +logs_dir = $(realpath -s "${BASE_DIR}")/job-results EOF export VIRTUAL_ENV="./" @@ -147,6 +147,6 @@ TESTFILE=$(realpath -s --relative-to=$(pwd) "${TESTSUITE_DIR}/citest.py") # the real stuff starts here, trace commands from now on set -x -avocado ${VERBOSE} run "${TESTFILE}" \ +avocado ${VERBOSE} --config "${BASE_DIR}/avocado.conf" run "${TESTFILE}" \ -t "${TAGS}" --max-parallel-tasks=1 --disable-sysinfo \ ${SSTATE} ${TIMEOUT} -- 2.34.1