fix(tests)_: identify containers with git sha

This commit:
- updates both status docker container names to include short git sha
- updates cleanup command to filter by git sha
- updates the cleanup stage in `jenkins` file to remove docker container via this git sha

This approach is more reliable in cleaning up docker containers and was tested by me on linux-03

_assets/ci/Jenkinsfile.tests-rpc

@@ -76,7 +76,14 @@ pipeline {
     }
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    cleanup { sh 'make git-clean' }
+      cleanup {
+        script {
+          sh '''
+            docker ps -a --filter "name=${env.GIT_COMMIT.take(7)}" -q | xargs -r docker rm
+            make git-clean
+          '''
+        }
+      }
   } // post
 } // pipeline
 

_assets/scripts/run_functional_tests.sh

@@ -24,13 +24,13 @@ mkdir -p "${merged_coverage_reports_path}"
 mkdir -p "${test_results_path}"
 
 all_compose_files="-f ${root_path}/docker-compose.anvil.yml -f ${root_path}/docker-compose.test.status-go.yml"
-timestamp=$(python3 -c "import time; print(int(time.time() * 1000))") # Keep in sync with status_backend.py
-project_name="status-go-func-tests-${timestamp}"
+git_sha=$(git rev-parse --short HEAD)
+project_name="status-go-func-tests-${git_sha}"
 
 export STATUS_BACKEND_URLS=$(eval echo http://${project_name}-status-backend-{1..${STATUS_BACKEND_COUNT}}:3333 | tr ' ' ,)
 
 # Remove orphans
-docker ps -a --filter "name=status-go-func-tests-*-status-backend-*" --filter "status=exited" -q | xargs -r docker rm
+docker ps -a --filter "${git_sha}" --filter "status=exited" -q | xargs -r docker rm
 
 # Run docker
 echo -e "${GRN}Running tests${RST}, HEAD: $(git rev-parse HEAD)"

tests-functional/clients/status_backend.py

@@ -63,9 +63,9 @@ def __init__(self, await_signals=[], privileged=False):
     def _start_container(self, host_port, privileged):
         docker_project_name = option.docker_project_name
 
-        timestamp = int(time.time() * 1000)  # Keep in sync with run_functional_tests.sh
+        git_sha = os.popen("git rev-parse --short HEAD").read().strip()
         image_name = f"{docker_project_name}-status-backend:latest"
-        container_name = f"{docker_project_name}-status-backend-{timestamp}"
+        container_name = f"{docker_project_name}-{git_sha}-status-backend-{host_port}"
 
         coverage_path = option.codecov_dir if option.codecov_dir else os.path.abspath("./coverage/binary")