Add daily e2e intergation tests and the keep tests and fix feature test naming

Change-Id: I97515f528e87012e627852b3d86277b63bab9cb0
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 34ffacd..e9cfddd 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -302,9 +302,10 @@
           exclude:
             - image_os: centos
       - capm3_e2e_integration_tests:
-      - capm3_e2e_tests_parallel:
-      - capm3_e2e_tests:
-      - keep_capm3_e2e_tests:
+      - parallel_capm3_e2e_feature_tests:
+      - capm3_e2e_feature_tests:
+      - keep_capm3_e2e_integration_tests:
+      - keep_capm3_e2e_feature_tests:
       - keep_capm3_e2e_upgrade_tests:
           exclude:
             - image_os: centos
@@ -324,7 +325,8 @@
       - capm3_main_e2e_ephemeral_tests:
           exclude:
             - image_os: ubuntu
-      - capm3_main_e2e_tests:
+      - capm3_main_e2e_integration_tests:
+      - capm3_main_e2e_feature_tests:
           capm3_target_branch:
             - main:
                 capi_version: v1beta1