make submodule dir repo name and removed common steps form downloading by default

Author: rwngwn

Diff for: circle.yml

@@ -15,6 +15,7 @@ test:
   override:
     - mkdir test_dir
     - cd test_dir && COVERAGE_FILE=../.coverage.init coverage run ../ctf-cli.py init
+    - cd test_dir && COVAREGE_FILE=../.coverage.remote_add coverage run ../ctf-cli.py remote add steps https://github.com/Containers-Testing-Framework/common-steps.git
     - cd test_dir && COVAREGE_FILE=../.coverage.remote_add coverage run ../ctf-cli.py remote add features https://github.com/Containers-Testing-Framework/common-features.git
     - cd test_dir && COVERAGE_FILE=../.coverage.update coverage run ../ctf-cli.py update
     - cd test_dir && COVERAGE_FILE=../.coverage.run coverage run ../ctf-cli.py run

Diff for: ctf_cli/application.py

@@ -100,13 +100,6 @@ def init(self):
             with open(steps_py_file, "w") as f:
                 f.write(common_steps_py_content)
             check_call("git add %s" % steps_py_file, shell=True)
-
-        common_steps_dir = os.path.join(steps_dir, "common_steps")
-        if os.path.exists(common_steps_dir):
-            logger.info("Directory tests/steps/common_steps already exists")
-        else:
-            logger.info("Adding tests/steps/common_steps as a submodule")
-            check_call('git submodule add https://github.com/Containers-Testing-Framework/common-steps.git tests/steps/common_steps', shell=True)
 
         # Copy sample configuration
         ctf_conf_file = os.path.join(self._execution_dir_path, "ctf.conf")
@@ -128,15 +121,15 @@ def add_remote(self):
     def add_remote_feature(self):
         project = self._cli_conf.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_PROJECT)
         if project is None:
-            path = "tests/features/common-remote"
+            path = "tests/features/"
         else:
             path = "tests/features/" + project
         self.add_submodule(path)
 
     def add_remote_step(self):
         project = self._cli_conf.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_PROJECT)
         if project is None:
-            path = "tests/steps/common-remote"
+            path = "tests/steps/"
         else:
             path = "tests/steps/" + project
         self.add_submodule(path)
@@ -146,7 +139,8 @@ def list_remotes(self):
 
     def add_submodule(self, path):
         url = self._cli_conf.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_URL)
-        check_call('git submodule add %s %s' % (url, path), shell=True)
+        dirname = os.path.splitext(os.path.basename(url))[0]
+        check_call('git submodule add %s %s' % (url, path + "/" + dirname), shell=True)
 
     def remove_remote(self):
         name = self._cli_conf.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_NAME)