Change cwd when --local-checkout enabled

Add new test file and adjust circleci
Add functions to testing lib: find_latest_sequence, check_file_startingwith_in_dir

.circleci/config.yml

@@ -35,6 +35,9 @@ jobs:
           command: |
             ./tests/01-test_argument_parsing.sh
             ./tests/02-checkrun.sh
+            mkdir -p /etc/alt-workdir
+            ./tests/02a-checkrun_with_self_setup.sh
+            rm -rf /etc/alt-workdir
             mv /etc/ansible-deployer /etc/alternate-deployer-dir
             mkdir -p /etc/ansible-deployer/hooks
             cp ./etc/hooks/setup_work_dir.sh /etc/ansible-deployer/hooks/

source/main.py

@@ -113,15 +113,12 @@ def main():
     validators.validate_options(options)
     selected_items = validators.validate_option_values_against_config(config, options)
 
-<<<<<<< HEAD
-=======
     if options["subcommand"] in ("run", "verify"):
         if options["self_setup"]:
             os.chdir(options["self_setup"])
         else:
             os.chdir(workdir)
 
->>>>>>> ac1a0a0 (fixx)
     user_groups = misc.get_all_user_groups(logger.logger)
 
     if options["dry"]:

source/modules/misc.py

@@ -35,7 +35,6 @@ def create_workdir(timestamp: str, conf: dict, logger):
 
     try:
         os.mkdir(seq_path)
-        os.chdir(seq_path)
     except Exception as e:
         logger.critical("Failed to create work dir: %s error was: %s", seq_path, e, file=sys.stderr)
         sys.exit(91)

source/modules/runners/run.py

@@ -30,8 +30,8 @@ def setup_ansible(self, setup_hooks: list, commit: str, workdir: str):
         checkout the default repo.
         """
         failed = False
-
         workdir, commit = Runners.reassign_commit_and_workdir(commit, workdir)
+
         for hook in setup_hooks:
             if hook["module"] == "script":
                 try:
@@ -63,7 +63,7 @@ def setup_ansible(self, setup_hooks: list, commit: str, workdir: str):
                         self.logger.critical("Setup hook %s failed, cannot continue", hook["name"])
                         sys.exit(40)
                     else:
-                        self.logger.info("Setup completed in %s", os.getcwd())
+                        self.logger.info("Setup completed in %s", workdir)
 
             else:
                 self.logger.error("Not supported")

source/modules/validators/validate.py

@@ -45,7 +45,7 @@ def validate_options(self, options: dict):
             required = ["task", "infra", "stage"]
         elif options["subcommand"] == "verify":
             required = ["task", "infra", "stage"]
-            notsupported = ["commit", "local_checkout"]
+            notsupported = ["commit"]
         elif options["subcommand"] in ("lock", "unlock"):
             required = ["infra", "stage"]
             notsupported = ["task", "commit", "limit", "self_setup"]

tests/02a-checkrun_with_self_setup.sh

@@ -0,0 +1,16 @@
+#!/bin/bash -l
+
+
+source ./tests/testing_lib.sh
+
+# Check if cwd is correctly switched when using --self-setup option
+check_message_in_output "ansible-deployer run -t task_exec_bin_true -s testing -i testInfra -d --self-setup /etc/alt-workdir" "\[DEBUG\]: Successfully created workdir: /tmp/"
+check_message_in_output "ansible-deployer run -t task_exec_bin_true -s testing -i testInfra -d --self-setup /etc/alt-workdir" "\[INFO\]: Setup completed in /etc/alt-workdir"
+search_path=$(find_latest_sequence)
+check_file_startingwith_in_dir "/etc/alt-workdir" "runBin.yaml"
+check_file_startingwith_in_dir "$search_path" "ansible-deploy_execution_"
+check_message_in_output "ansible-deployer verify --task=task_exec_bin_true -s testing -i testInfra -d --self-setup /etc/alt-workdir" "\[DEBUG\]: Successfully created workdir: /tmp/"
+check_message_in_output "ansible-deployer verify --task=task_exec_bin_true -s testing -i testInfra -d --self-setup /etc/alt-workdir" "\[INFO\]: Setup completed in /etc/alt-workdir"
+search_path=$(find_latest_sequence)
+check_file_startingwith_in_dir "/etc/alt-workdir" "runBin.yaml"
+check_file_startingwith_in_dir "$search_path" "ansible-deploy_execution_"

tests/testing_lib.sh

@@ -56,3 +56,19 @@ check_file_permissions() {
 		echo "FAILED: $1 has incorrect permissions $2"
 	fi
 }
+
+find_latest_sequence() {
+	last_seq="$(ls /tmp/$(date +%Y%m%d) | tail -n 1)"
+	echo "/tmp/$(date +%Y%m%d)/${last_seq}"
+}
+
+check_file_startingwith_in_dir() {
+	eval "find $1 -name "${2}*" 1>/dev/null"
+	if [ $? -eq 0 ]
+	then
+		echo "OK: $1 has file starting with pattern $2"
+	else
+		echo "FAILED: $1 does not contain file starting with pattern $2"
+		exit 1
+	fi
+}