From e6b74fd44c4e3d9304363ef3d367600bb9b0538d Mon Sep 17 00:00:00 2001
From: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Date: Thu, 3 Jun 2021 07:36:07 +0000
Subject: [PATCH] github-ci: correct artifacts paths
Found that after change:
474eda49b90176406eac6684c8b502e05e49af04 ('github-ci: use vardir option in tests runs')
where 'vardir' was changed. It was forgot to update the Github Actions
workflows with the same change to be able to collect artifacts. This
patch fixes it.
Closes tarantool/tarantool-qa#125
---
.github/actions/environment/action.yml | 1 +
.github/workflows/coverity.yml | 2 +-
.github/workflows/debug_coverage.yml | 2 +-
.github/workflows/freebsd.yml | 2 +-
.github/workflows/osx_10_15.yml | 2 +-
.github/workflows/osx_10_15_lto.yml | 2 +-
.github/workflows/osx_11_0.yml | 2 +-
.github/workflows/release.yml | 2 +-
.github/workflows/release_asan_clang11.yml | 2 +-
.github/workflows/release_clang.yml | 2 +-
.github/workflows/release_lto.yml | 2 +-
.github/workflows/release_lto_clang11.yml | 2 +-
.github/workflows/static_build.yml | 2 +-
.github/workflows/static_build_cmake_linux.yml | 2 +-
.github/workflows/static_build_cmake_osx_15.yml | 2 +-
.gitlab.mk | 4 +++-
16 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/.github/actions/environment/action.yml b/.github/actions/environment/action.yml
index 5aa9ff6605..03d1f6c1ef 100644
--- a/.github/actions/environment/action.yml
+++ b/.github/actions/environment/action.yml
@@ -4,6 +4,7 @@ runs:
using: "composite"
steps:
- run: |
+ echo VARDIR=/tmp/tnt | tee -a $GITHUB_ENV
echo REPLICATION_SYNC_TIMEOUT=300 | tee -a $GITHUB_ENV
echo TEST_TIMEOUT=310 | tee -a $GITHUB_ENV
echo NO_OUTPUT_TIMEOUT=320 | tee -a $GITHUB_ENV
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index b3f6a9aa5f..038a52955c 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -58,7 +58,7 @@ jobs:
with:
name: debug
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
# Find the PR associated with this push, if there is one.
- uses: jwalton/gh-find-current-pr@v1
if: success()
diff --git a/.github/workflows/debug_coverage.yml b/.github/workflows/debug_coverage.yml
index 3a5d3b606d..f9510cba29 100644
--- a/.github/workflows/debug_coverage.yml
+++ b/.github/workflows/debug_coverage.yml
@@ -86,5 +86,5 @@ jobs:
name: debug
retention-days: 21
path: |
- test/var/artifacts
+ ${{ env.VARDIR }}/artifacts
*.info
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
index 59666e8c57..78f10f02c9 100644
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@@ -48,4 +48,4 @@ jobs:
with:
name: freebsd
retention-days: 21
- path: test/var/artifacts
+ path: ./artifacts
diff --git a/.github/workflows/osx_10_15.yml b/.github/workflows/osx_10_15.yml
index c68f00ccbf..07ee59fcce 100644
--- a/.github/workflows/osx_10_15.yml
+++ b/.github/workflows/osx_10_15.yml
@@ -46,4 +46,4 @@ jobs:
with:
name: osx_10_15
retention-days: 21
- path: /tmp/tnt/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/osx_10_15_lto.yml b/.github/workflows/osx_10_15_lto.yml
index c2e833a89a..e9184855a7 100644
--- a/.github/workflows/osx_10_15_lto.yml
+++ b/.github/workflows/osx_10_15_lto.yml
@@ -46,4 +46,4 @@ jobs:
with:
name: osx_10_15_lto
retention-days: 21
- path: /tmp/tnt/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/osx_11_0.yml b/.github/workflows/osx_11_0.yml
index 32397f6694..9c9acd1363 100644
--- a/.github/workflows/osx_11_0.yml
+++ b/.github/workflows/osx_11_0.yml
@@ -46,4 +46,4 @@ jobs:
with:
name: osx_11_0
retention-days: 21
- path: /tmp/tnt/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b35c748a2f..a8f60f11d8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,4 +49,4 @@ jobs:
with:
name: release
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/release_asan_clang11.yml b/.github/workflows/release_asan_clang11.yml
index d8df848e2e..eb42b4417f 100644
--- a/.github/workflows/release_asan_clang11.yml
+++ b/.github/workflows/release_asan_clang11.yml
@@ -49,4 +49,4 @@ jobs:
with:
name: release_asan_clang11
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/release_clang.yml b/.github/workflows/release_clang.yml
index b7aa9b731a..d2a225fc33 100644
--- a/.github/workflows/release_clang.yml
+++ b/.github/workflows/release_clang.yml
@@ -52,4 +52,4 @@ jobs:
with:
name: release_clang
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/release_lto.yml b/.github/workflows/release_lto.yml
index e686db109e..48d946ca53 100644
--- a/.github/workflows/release_lto.yml
+++ b/.github/workflows/release_lto.yml
@@ -51,4 +51,4 @@ jobs:
with:
name: release_lto
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/release_lto_clang11.yml b/.github/workflows/release_lto_clang11.yml
index b1295ec600..1dea524907 100644
--- a/.github/workflows/release_lto_clang11.yml
+++ b/.github/workflows/release_lto_clang11.yml
@@ -53,4 +53,4 @@ jobs:
with:
name: release_lto_clang11
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/static_build.yml b/.github/workflows/static_build.yml
index cb9efca2c3..adc6f23c33 100644
--- a/.github/workflows/static_build.yml
+++ b/.github/workflows/static_build.yml
@@ -49,4 +49,4 @@ jobs:
with:
name: static_build
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/static_build_cmake_linux.yml b/.github/workflows/static_build_cmake_linux.yml
index 8451cd2e2c..31c48f32cb 100644
--- a/.github/workflows/static_build_cmake_linux.yml
+++ b/.github/workflows/static_build_cmake_linux.yml
@@ -49,4 +49,4 @@ jobs:
with:
name: static_build_cmake_linux
retention-days: 21
- path: test/var/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.github/workflows/static_build_cmake_osx_15.yml b/.github/workflows/static_build_cmake_osx_15.yml
index 4e03ade25d..49dfbefef3 100644
--- a/.github/workflows/static_build_cmake_osx_15.yml
+++ b/.github/workflows/static_build_cmake_osx_15.yml
@@ -43,4 +43,4 @@ jobs:
with:
name: static_build_cmake_osx_15
retention-days: 21
- path: /tmp/tnt/artifacts
+ path: ${{ env.VARDIR }}/artifacts
diff --git a/.gitlab.mk b/.gitlab.mk
index 6b2c10d4f7..5068b71f26 100644
--- a/.gitlab.mk
+++ b/.gitlab.mk
@@ -103,7 +103,9 @@ vms_start:
vms_test_%:
tar czf - ../tarantool | ssh ${VMS_USER}@127.0.0.1 -p ${VMS_PORT} tar xzf -
ssh ${VMS_USER}@127.0.0.1 -p ${VMS_PORT} "/bin/bash -c \
- 'cd tarantool && ${PRESERVE_ENV} ${TRAVIS_MAKE} $(subst vms_,,$@)'"
+ 'cd tarantool && ${PRESERVE_ENV} ${TRAVIS_MAKE} $(subst vms_,,$@)'" || \
+ ( scp -r -P ${VMS_PORT} ${VMS_USER}@127.0.0.1:tarantool/test/var/artifacts . \
+ ; exit 1 )
vms_shutdown:
VBoxManage controlvm ${VMS_NAME} poweroff
--
GitLab