ci: fix dir step (#721)

* chore: interchange steps order
* fix: set folder name to PythonVersion/framework

Author: kuisathaverat

Jenkinsfile

@@ -341,20 +341,20 @@ class PythonParallelTaskGenerator extends DefaultParallelTaskGenerator {
               keepLongStdio: true,
               testResults: "**/python-agent-junit.xml,**/target/**/TEST-*.xml"
             )
+            steps.dir("${steps.env.BASE_DIR}/tests"){
+              steps.archiveArtifacts(
+                allowEmptyArchive: true,
+                artifacts: '**/docker-info/**',
+                defaultExcludes: false
+              )
+            }
             steps.env.PYTHON_VERSION = "${x}"
             steps.env.WEBFRAMEWORK = "${y}"
             steps.codecov(repo: "${steps.env.REPO}",
               basedir: "${steps.env.BASE_DIR}",
               flags: "-e PYTHON_VERSION,WEBFRAMEWORK",
               secret: "${steps.env.CODECOV_SECRET}"
             )
-            dir("${steps.env.BASE_DIR}/tests"){
-              steps.archiveArtifacts(
-                allowEmptyArchive: true,
-                artifacts: '**/docker-info/**',
-                defaultExcludes: false
-              )
-            }
           }
         }
       }

tests/scripts/docker/run_tests.sh

@@ -4,7 +4,7 @@ set -ex
 function cleanup {
     if [ -n "${BUILD_NUMBER}" ]; then # only on CI
         ./scripts/docker/docker-summary.sh
-        ./scripts/docker/docker-get-logs.sh "${1}-${2}"
+        ./scripts/docker/docker-get-logs.sh "${TEST}"
     fi
     PYTHON_VERSION=${1} docker-compose down -v
 
@@ -22,6 +22,7 @@ fi
 
 pip_cache="$HOME/.cache"
 docker_pip_cache="/tmp/cache/pip"
+TEST="${1}/${2}"
 
 cd tests