From e4d89b6d6bccb58191d60b1fc32a8ccb431cc234 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 15 Sep 2020 14:25:05 -0700 Subject: [PATCH] Tweak how we add repos to mock config a bit Not sure if the other way was valid. Signed-off-by: Adam Williamson --- tests/_live_build.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/_live_build.pm b/tests/_live_build.pm index 6de91503..8dee8176 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -28,10 +28,8 @@ sub run { assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_enable\'] = True" >> /etc/mock/openqa.cfg'; assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/opt/update_repo\', \'/opt/update_repo\'))" >> /etc/mock/openqa.cfg'; assert_script_run 'echo "config_opts[\'plugin_conf\'][\'bind_mount_opts\'][\'dirs\'].append((\'/dev/' . $serialdev . '\', \'/dev/' . $serialdev . '\'))" >> /etc/mock/openqa.cfg'; - # add the side repo to the config - assert_script_run 'printf "config_opts[\'dnf.conf\'] += \"\"\"\n[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n\"\"\"" >> /etc/mock/openqa.cfg'; - # and the workarounds repo - assert_script_run 'printf "config_opts[\'dnf.conf\'] += \"\"\"\n[workarounds]\nname=Workarounds repo\nbaseurl=file:///opt/workarounds_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n\"\"\"" >> /etc/mock/openqa.cfg'; + # add the side repo and workarounds to the config + assert_script_run 'printf "config_opts[\'dnf.conf\'] += \"\"\"\n[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n\n[workarounds]\nname=Workarounds repo\nbaseurl=file:///opt/workarounds_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0\n\"\"\"" >> /etc/mock/openqa.cfg'; # replace metalink with mirrorlist so we don't get slow mirrors repos_mirrorlist("/etc/mock/openqa.cfg"); # upload the config so we can check it's OK