nb5 revamp for scenarios

adapters-api/src/main/resources/workload_definition/02_workload_structure.md

@@ -302,7 +302,7 @@ in the workload construction guide.
 
 ```yaml
 tags:
-  phase: main
+  block: main
 ```
 
 *json:*
@@ -311,7 +311,7 @@ tags:
 
 {
   "tags": {
-    "phase": "main"
+    "block": "main"
   }
 }
 ```
@@ -331,7 +331,7 @@ Blocks are used to logically partition a workload for the purposes of grouping,
 executing subsets and op sequences. Blocks can contain any of the defined elements above.
 Every op template within a block automatically gets a tag with the name 'block' and the value of
 the block name. This makes it easy to select a whole block at a time with a tag filter like
-`tags=block:schema`.
+`tags=block:"schema.*"`.
 
 Blocks are not recursive. You may not put a block inside another block.
 

adapters-api/src/main/resources/workload_definition/04_op_template_basics.md

@@ -269,7 +269,7 @@ ops:
     bindings:
       binding1: NumberNameToString();
     tags:
-      phase: schema
+      block: schema
     params:
       prepared: false
     description: This is just an example operation
@@ -292,7 +292,7 @@ ops:
         "prepared": false
       },
       "tags": {
-        "phase": "schema"
+        "block": "schema"
       }
     }
   }
@@ -317,7 +317,7 @@ ops:
       "prepared": false
     },
     "tags": {
-      "phase": "schema",
+      "block": "schema",
       "name": "block0--special-op-name",
       "block": "block0"
     }
@@ -351,7 +351,7 @@ blocks:
     bindings:
       binding1: NumberNameToString();
     tags:
-      phase: schema
+      block: schema
     params:
       prepared: false
     description: This is just an example operation
@@ -386,7 +386,7 @@ blocks:
         "prepared": false
       },
       "tags": {
-        "phase": "schema"
+        "block": "schema"
       },
       "ops": {
         "op1": {
@@ -416,7 +416,7 @@ blocks:
       "prepared": false
     },
     "tags": {
-      "phase": "schema",
+      "block": "schema",
       "docleveltag": "is-tagging-everything",
       "name": "block-named-fred--special-op-name",
       "block": "block-named-fred"

adapters-api/src/test/java/io/nosqlbench/engine/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java

@@ -77,7 +77,7 @@ public class RawYamlTemplateLoaderTest {
         assertThat(schemaOnlyScenario.keySet())
             .containsExactly("000");
         assertThat(schemaOnlyScenario.values())
-            .containsExactly("run driver=blah tags=phase:schema");
+            .containsExactly("run driver=blah tags=block:'schema.*'");
 
         assertThat(rawOpsDoc.getName()).isEqualTo("doc1");
         assertThat(blocks).hasSize(1);

adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml

@@ -7,7 +7,7 @@ scenarios:
     - run driver=stdout alias=step1
     - run driver=stdout alias=step2
   schema-only:
-    - run driver=blah tags=phase:schema
+    - run driver=blah tags=block:'schema.*'
 
 tags:
   atagname: atagvalue