FiX for CI, issue with docker id collision

openucx · Oct 8, 2024 · e99a5e8 · e99a5e8
1 parent e5cb294
commit e99a5e8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.ci/job_matrix.yaml b/.ci/job_matrix.yaml
@@ -67,8 +67,8 @@ steps:
       echo "INFO: Start docker containers"
       DOCKER_IMAGE_NAME="${UCC_DOCKER_IMAGE_NAME}:${BUILD_ID}"
       docker pull ${DOCKER_IMAGE_NAME}
-      docker create -ti --rm $DOCKER_OPT ${DOCKER_IMAGE_NAME} /bin/bash > ${WORKSPACE}/ucc_docker.id
-      docker start $(cat ${WORKSPACE}/ucc_docker.id)
+      docker create -ti --rm $DOCKER_OPT ${DOCKER_IMAGE_NAME} /bin/bash > /tmp/ucc_docker-"${BUILD_TAG}".id
+      docker start $(cat /tmp/ucc_docker-"${BUILD_TAG}".id)
   #============================================================================
   - name: Run Coverity
     credentialsId: "bc9a18d3-1153-449c-b924-7fc9249c9cc0"
@@ -85,9 +85,9 @@ steps:
     run: |
       echo "INFO: Run UCC tests"
       hostname
-      docker exec $(cat ${WORKSPACE}/ucc_docker.id) bash -c "\${SRC_DIR}/ucc/.ci/scripts/run_tests_ucc.sh"
+      docker exec $(cat /tmp/ucc_docker-"${BUILD_TAG}".id) bash -c "\${SRC_DIR}/ucc/.ci/scripts/run_tests_ucc.sh"
     always: |
-      docker rm --force $(cat ${WORKSPACE}/ucc_docker.id)
+      docker rm --force $(cat /tmp/ucc_docker-"${BUILD_TAG}".id)
   #============================================================================
   - name: Run docker containers
     agentSelector: "{nodeLabel: 'swx-clx01'}"

diff --git a/.ci/scripts/run_docker.sh b/.ci/scripts/run_docker.sh
@@ -79,7 +79,7 @@ for HOST in $(cat "$HOSTFILE"); do
     ssh "$HOST" "docker run \
         ${DOCKER_RUN_ARGS} \
         ${DOCKER_IMAGE_NAME} \
-        bash -c 'sudo /usr/sbin/sshd -p ${DOCKER_SSH_PORT}; sleep infinity'"
+        sudo /usr/sbin/sshd -D -p 12345"
     echo "INFO: start docker container on $HOST ... DONE"
 
     sleep 5