Skip to content

Commit e8b9dc3

Browse files
authored
build: fix ci for repository dispatch case (#257)
1 parent 18dbf75 commit e8b9dc3

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

.github/workflows/integration_tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd /src
88

99
echo -e "[metwork_${DEP_BRANCH}]" >/etc/yum.repos.d/metwork.repo
1010
echo -e "name=Metwork Continuous Integration Branch ${DEP_BRANCH}" >> /etc/yum.repos.d/metwork.repo
11-
echo -e "baseurl=http://metwork-framework.org/pub/metwork/continuous_integration/rpms/${DEP_BRANCH}/${OS_VERSION}/" >> /etc/yum.repos.d/metwork.repo
11+
echo -e "baseurl=http://metwork-framework.org/pub/metwork/continuous_integration/rpms/${DEP_BRANCH}/centos6/" >> /etc/yum.repos.d/metwork.repo
1212
echo -e "gpgcheck=0\n\enabled=1\n\metadata_expire=0\n" >>/etc/yum.repos.d/metwork.repo
1313

1414
for rpm in ./rpms/metwork-mfext*.rpm; do rpm -qp --requires ./$rpm | grep metwork | grep -v "=" >> liste_dep; done

.github/workflows/set_variables.sh

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
#set -eu
44
set -x
55

6-
if test "${OS_VERSION:-}" = ""; then
7-
echo "ERROR: OS_VERSION env is empty"
8-
exit 1
9-
fi
10-
116
TAG=
127
DEP_BRANCH=
138
TARGET_DIR=
@@ -97,9 +92,9 @@ echo "::set-output name=tag::${TAG}"
9792
echo "::set-output name=dep_branch::${DEP_BRANCH}"
9893
echo "::set-output name=target_dir::${TARGET_DIR}"
9994
echo "::set-output name=dep_dir::${DEP_DIR}"
100-
echo "::set-output name=buildimage::metwork/mfxxx-${OS_VERSION}-buildimage:${DEP_BRANCH}"
101-
echo "::set-output name=testimage::metwork/mfxxx-${OS_VERSION}-testimage:${DEP_BRANCH}"
102-
echo "::set-output name=buildlog_dir::/pub/metwork/${CI}/buildlogs/${B}/mfextaddon_scientific/${OS_VERSION}/${GITHUB_RUN_NUMBER}"
95+
echo "::set-output name=buildimage::metwork/mfxxx-centos6-buildimage:${DEP_BRANCH}"
96+
echo "::set-output name=testimage::metwork/mfxxx-centos6-testimage:${DEP_BRANCH}"
97+
echo "::set-output name=buildlog_dir::/pub/metwork/${CI}/buildlogs/${B}/mfextaddon_scientific/centos6/${GITHUB_RUN_NUMBER}"
10398

104-
echo "::set-output name=rpm_dir::/pub/metwork/${CI}/rpms/${B}/${OS_VERSION}"
99+
echo "::set-output name=rpm_dir::/pub/metwork/${CI}/rpms/${B}/centos6"
105100
echo "::set-output name=doc_dir::/pub/metwork/${CI}/docs/${B}/mfextaddon_scientific"

0 commit comments

Comments
 (0)