From 7de60bb59b767a20db6986990ed5dbaf4e6ea265 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 26 Jul 2024 13:05:47 -0700 Subject: [PATCH] tests: Don't use undefined variable The test.environment variable was removed from the variables defined in tests.yml in commit 1b207227f3981193, but it's still used, which causes Ansible to break: The task includes an option with an undefined variable. The error was: 'dict object' has no attribute 'environment'. 'dict object' has no attribute 'environment' https://src.fedoraproject.org/rpms/toolbox/pull-request/19 --- tests/roles/run_bats_tests/tasks/run_one_test.yml | 3 +-- toolbox.spec | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/roles/run_bats_tests/tasks/run_one_test.yml b/tests/roles/run_bats_tests/tasks/run_one_test.yml index b44ed42..a58477d 100644 --- a/tests/roles/run_bats_tests/tasks/run_one_test.yml +++ b/tests/roles/run_bats_tests/tasks/run_one_test.yml @@ -15,7 +15,6 @@ local_environment: TEST_NAME: "{{ test.name }}" TEST_PACKAGE: "{{ test.package }}" - TEST_ENV: "{{ test.environment }}" - name: "{{ test.name }} | setup/teardown helper | see if exists" local_action: stat path={{ role_path }}/files/helper.{{ test_name_oneword }}.sh @@ -31,7 +30,7 @@ chdir: /usr/share/{{ test.package }}/test/system become: "{{ true if test.become is defined else false }}" become_user: testuser - environment: "{{ local_environment | combine(test.environment) }}" + environment: "{{ local_environment }}" - name: "{{ test.name }} | pull logs" fetch: diff --git a/toolbox.spec b/toolbox.spec index 2c71d92..50192b4 100644 --- a/toolbox.spec +++ b/toolbox.spec @@ -31,7 +31,7 @@ Version: 0.0.99.5 %endif %endif -Release: 13%{?dist} +Release: 14%{?dist} Summary: Tool for interactive command line environments on Linux License: Apache-2.0 @@ -206,6 +206,9 @@ install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/%{name}.conf %changelog +* Fri Jul 26 2024 Adam Williamson - 0.0.99.5-14 +- Fix CI test (hopefully) + * Thu Jul 11 2024 Debarshi Ray - 0.0.99.5-13 - Silence 'rpminspect --tests=stack-prot'