Clean up examples, remove deprecated execute method (#3330)

The `shell` execute method has been dropped a long time ago. Let's get rid of the last mentions. Also remove some irrelevant outdated examples which were part of the initial brainstorming. Update several examples to make them actually working.
teemtee · Oct 31, 2024 · c1ac0ad · c1ac0ad
1 parent 05814dc
commit c1ac0ad
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 250 deletions.
diff --git a/examples/environment/main.fmf b/examples/environment/main.fmf
@@ -3,12 +3,15 @@
         Environment variable.
     description:
         Tests can be provided with a list of environment variables.
+    discover:
+        how: fmf
     execute:
-        how: shell
+        how: tmt
 
 /test:
     summary: Just a simple test
-    test: ./test.sh
+    test:
+        echo "x = '$x', y = '$y', z = '$z'"
     environment:
         x: That's nice!
         y: a b c

diff --git a/examples/httpd/smoke.fmf b/examples/httpd/smoke.fmf
@@ -11,7 +11,7 @@ prepare:
     how: shell
     script: systemctl start httpd
 execute:
-    how: shell
+    how: tmt
     script:
       - echo foo > /var/www/html/index.html
       - curl http://localhost/ | grep foo
diff --git a/examples/l2/.fmf/version b/examples/l2/.fmf/version
diff --git a/examples/l2/artifacts.fmf b/examples/l2/artifacts.fmf
diff --git a/examples/l2/bed.fmf b/examples/l2/bed.fmf
diff --git a/examples/l2/gating.fmf b/examples/l2/gating.fmf
diff --git a/examples/l2/rpmdiff.fmf b/examples/l2/rpmdiff.fmf
diff --git a/examples/l2/simple.fmf b/examples/l2/simple.fmf
diff --git a/examples/l2/tooling.fmf b/examples/l2/tooling.fmf
diff --git a/examples/l2/workflow.fmf b/examples/l2/workflow.fmf
diff --git a/examples/rtt/.fmf/version b/examples/rtt/.fmf/version
diff --git a/examples/rtt/install.fmf b/examples/rtt/install.fmf
diff --git a/examples/rtt/post-install.fmf b/examples/rtt/post-install.fmf
diff --git a/examples/together/main.fmf b/examples/together/main.fmf
@@ -5,15 +5,13 @@
     discover:
         how: fmf
     prepare:
-        how: ansible
-        playbook: packages.yaml
+        how: install
+        package: [python3, make]
     execute:
-        how: shell
+        how: tmt
 
 /tests:
     /smoke:
         test: python3 -c "import time"
-        path: /
     /full:
         test: make check
-        path: /
diff --git a/spec/plans/main.fmf b/spec/plans/main.fmf
@@ -54,7 +54,7 @@ example: |
         how: shell
         script: systemctl start httpd
     execute:
-        how: shell
+        how: tmt
         script:
-        - echo foo > /var/www/html/index.html
-        - curl http://localhost/ | grep foo
+          - echo foo > /var/www/html/index.html
+          - curl http://localhost/ | grep foo
diff --git a/stories/cli/run.fmf b/stories/cli/run.fmf
@@ -43,15 +43,15 @@ story: 'As a user I want to execute tests easily'
                 discover:
                     how: fmf
                 execute:
-                    how: shell
+                    how: tmt
 
             /default/plan:
                 summary:
                     Default plan when no fmf metadata around
                 discover:
                     how: shell
                 execute:
-                    how: shell
+                    how: tmt
         link:
           - implemented-by: /tmt/base.py
           - verified-by: /tests/run/default