automation: create EXPORT_DIR only in scripts

We already prepare the exported-artifacts directory in test scripts if it does not exists. There is no reason to create it before in the GitHub action. This simplifies the action a little and reduces duplication. Signed-off-by: Tomáš Golembiovský <[email protected]>
oVirt · Feb 1, 2022 · c5b84f8 · c5b84f8
1 parent 60cb84b
commit c5b84f8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -12,8 +12,6 @@ jobs:
       matrix:
         distro: [el8stream, el9stream]
     steps:
-      - name: Prepare env
-        run: mkdir -p ${PWD}/${EXPORT_DIR}/
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

diff --git a/automation/build-artifacts.sh b/automation/build-artifacts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
-[[ -d exported-artifacts ]] \
-|| mkdir -p exported-artifacts
+[[ -d "${EXPORT_DIR}" ]] \
+|| mkdir -p "${EXPORT_DIR}"
 
 # mock runner is not setting up the system correctly
 # https://issues.redhat.com/browse/CPDEVOPS-242
@@ -27,7 +27,7 @@ rpmbuild \
     -ta ./*.tar.gz
 
 # Move tarball to exported artifacts
-mv ./*.tar.gz exported-artifacts/
+mv ./*.tar.gz "${EXPORT_DIR}/"
 
 # Move RPMs to exported artifacts
-find "$BUILD_DIR" -iname \*rpm -exec mv "{}" exported-artifacts/ \;
+find "$BUILD_DIR" -iname \*rpm -exec mv "{}" "${EXPORT_DIR}/" \;
diff --git a/automation/check-patch.sh b/automation/check-patch.sh
@@ -8,7 +8,7 @@ PYTHONDONTWRITEBYTECODE=1 \
     PYTHONPATH="..:.:$PYTHONPATH" \
     python3 -m coverage run --rcfile=../automation/coverage.rc testrunner.py ./*.py
 python3 -m coverage html --rcfile=../automation/coverage.rc
-mv htmlcov ../exported-artifacts/htmlcov-py3
+mv htmlcov "../${EXPORT_DIR}/htmlcov-py3"
 cd ..
 
-dnf --downloadonly install -y exported-artifacts/*noarch*.rpm
+dnf --downloadonly install -y "${EXPORT_DIR}"/*noarch*.rpm