diff --git a/gitlab_release/.gitlab-ci.yml b/gitlab_release/.gitlab-ci.yml index 7d16aa8..d1ebfa9 100644 --- a/gitlab_release/.gitlab-ci.yml +++ b/gitlab_release/.gitlab-ci.yml @@ -62,7 +62,7 @@ commit footer refs: before_script: - mkdir -p "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/$CI_JOB_NAME" - mkdir -p "$CI_PROJECT_DIR/artifacts/$CI_JOB_STAGE/tests" - - if [ "0$JOB_ROOT_DIR" == "0" ]; then ROOT_DIR=$DEFAULT_ROOT_DIR; else ROOT_DIR=$JOB_ROOT_DIR ; fi + - if [ "0$JOB_ROOT_DIR" == "0" ]; then export ROOT_DIR=$DEFAULT_ROOT_DIR; else export ROOT_DIR=$JOB_ROOT_DIR ; fi - echo "[DEBUG] ROOT_DIR[$ROOT_DIR]" - apt update - apt install --no-install-recommends -y git diff --git a/gitlab_release/python-module/commit_footer/commits.py b/gitlab_release/python-module/commit_footer/commits.py index a79b16e..f7a344c 100644 --- a/gitlab_release/python-module/commit_footer/commits.py +++ b/gitlab_release/python-module/commit_footer/commits.py @@ -76,7 +76,7 @@ class Commits: for commit in self._failed: for key in commit: junit_testcase += ''' - + {1} @@ -84,11 +84,11 @@ class Commits: - '''.format(key, str(commit[key])) + '''.format(key, str(commit[key], os.environ['ROOT_DIR'])) if junit_testcase == '': - junit_testcase = '' + junit_testcase = '' junit_close = '' print(str(junit_testsuites))