[beaker-tests-backend] modularity test update + pre-creation of /etc/…

…fm.modules.d directory
fedora-copr · Sep 19, 2016 · b150e5d · b150e5d
1 parent 6e2827a
commit b150e5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/beaker-tests/Regression/backend/tests/modularity/_copr_@modularity-template-project.cfg b/beaker-tests/Regression/backend/tests/modularity/_copr_@modularity-template-project.cfg
@@ -1,4 +1,4 @@
 [group-modularity-template-project]
 name = Copr modules repo for @modularity/template-project
-url = http://localhost:5002/results/@modularity/template-project/
+url = http://localhost:5002/results/@modularity/template-project/modules
 enabled = 1
diff --git a/beaker-tests/Regression/backend/tests/modularity/run.sh b/beaker-tests/Regression/backend/tests/modularity/run.sh
@@ -10,6 +10,7 @@ export OUT=$TESTPATH/action-results.out.json
 
 rlJournalStart
     rlPhaseStartSetup
+        mkdir -p /etc/fm.modules.d
         dnf -y copr enable @modularity/fm
         dnf -y copr enable @modularity/modulemd
         dnf -y copr enable @modularity/modulemd-resolver
@@ -18,7 +19,7 @@ rlJournalStart
         cp _copr_@modularity-template-project.cfg /etc/fm.modules.d/
         dnf -y remove rare_example
         rm -r /var/cache/fm/
-        docker exec copr-backend /bin/sh -c 'rm -rf /var/lib/copr/public_html/results/@modularity/template-project/{*+*,modules.json}'
+        docker exec copr-backend /bin/sh -c 'rm -rf /var/lib/copr/public_html/results/@modularity/template-project/modules/{*+*,modules.json}'
     rlPhaseEnd
 
     rlPhaseStartTest Actions