enable/disable some e2e tests; rm TODOs; rework regex

contrib/test/integration/e2e-features.yml

@@ -4,6 +4,11 @@
   include: "e2e-base.yml"
 
 - name: Buffer the e2e testing command to workaround Ansible YAML folding "feature"
+  vars:
+    skip_tests:
+      - "[Slow]"
+      - "[Flaky]"
+      - "[Serial]"
   set_fact:
     e2e_shell_cmd: >
         KUBE_CONTAINER_RUNTIME="remote" GINKGO_PARALLEL_NODES=6 GINKGO_PARALLEL=y
@@ -14,7 +19,7 @@
                         --ginkgo.noColor
                         --ginkgo.succinct
                         --ginkgo.focus=\[NodeFeature:.*\]|\[Feature:(Seccomp|ScopeSelectors|PodPriority|Ingress|ComprehensiveNamespaceDraining|Networking-IPv4|TokenRequestProjection)\]
-                        --ginkgo.skip=\[(Slow|Flaky)\]
+                        --ginkgo.skip={{ skip_tests | join('|') | replace(' ', '\\s') | regex_replace('([][)(])', '\\\\\1') }}
                         --report-dir={{ artifacts }}"
             &> {{ artifacts }}/e2e.log
   # Fix vim syntax hilighting: "

contrib/test/integration/e2e.yml

@@ -9,22 +9,32 @@
     state: present
     value: 1048576
 
-# TODO remove the second to last test skipped once https://github.com/cri-o/cri-o/pull/1217 is merged
-# TODO remove the last six tests once the newtworking issue with AWS is figured out https://github.com/cri-o/cri-o/issues/1529
 - name: Buffer the e2e testing command to workaround Ansible YAML folding "feature"
+  vars:
+    skip_tests:
+      - "[Slow]"
+      - "[Serial]"
+      - "[Disruptive]"
+      - "[Flaky]"
+      - "[Feature:"
+      - "[sig-instrumentation] MetricsGrabber"
+      - "for NodePort service"
+      - "In-tree Volumes [Driver: local]"
+      - "PersistentVolumes-local"
+      - "CSI Volumes [Driver: csi-hostpath] [Testpattern: Dynamic PV (block volmode)] provisioning should provision storage with pvc data source"
+      - "CSI Volumes [Driver: csi-hostpath] [Testpattern: Dynamic PV (block volmode)] volumes should store data"
   set_fact:
     e2e_shell_cmd: >
         DBUS_SESSION_BUS_ADDRESS="unix:path=/var/run/dbus/system_bus_socket" KUBE_CONTAINER_RUNTIME="remote" GINKGO_TOLERATE_FLAKES="y" GINKGO_PARALLEL_NODES=6 GINKGO_PARALLEL=y KUBE_SSH_USER="{{ ssh_user }}" LOCAL_SSH_KEY="{{ ssh_location }}"
             "{{ ansible_env.GOPATH }}"/bin/kubetest
             --provider=local
             --test
             --test_args="-host=https://{{ ansible_default_ipv4.address }}:6443
-                        --ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\]|PersistentVolumes|\[HPA\]|should.support.building.a.client.with.a.CSR|should.propagate.mounts.to.the.host|for.NodePort.service|type.clusterIP|unready.pods|ExternalName.services|Guestbook.application|in-cluster.config|Pods.should.support.pod.readiness.gates|\[sig-storage\].In-tree.Volumes.\[Driver:.local\]|\[sig-storage\].CSI.Volumes.CSI.Topology.test.using.GCE.PD.driver|\[sig\-storage\]\sCSI\sVolumes\s\[Driver\:\scsi\-hostpath\]\s\[Testpattern\:\sDynamic\sPV\s\(block\svolmode\)\]\svolumes\sshould\sstore\sdata|\[sig\-storage\]\sCSI\sVolumes\s\[Driver\:\scsi\-hostpath\]\s\[Testpattern\:\sDynamic\sPV\s\(block\svolmode\)\]\sprovisioning\sshould\sprovision\sstorage\swith\spvc\sdata\ssource|\[sig-network\]\sServices\sshould\sbe\sable\sto\spreserve\sUDP\straffic\swhen\sserver\spod\scycles\sfor\sa\sNodePort\sservice|Events.should.be.sent.by.kubelets.and.the.scheduler.about.pods.scheduling.and.running|\[sig\-apps\].DisruptionController.should.block.an.eviction.until.the.PDB.is.updated.to.allow.it|\[sig\-instrumentation\].MetricsGrabber
+                        --ginkgo.skip={{ skip_tests | join('|') | replace(' ', '\\s') | regex_replace('([][)(])', '\\\\\1') }}
                         --ginkgo.noColor
                         --ginkgo.succinct
                         --report-dir={{ artifacts }}"
             &> {{ artifacts }}/e2e.log
-  # Fix vim syntax highlighting: "
 
 - block: