Commit 1a87e811 authored by Jérome Perrin's avatar Jérome Perrin

Repair software release tests

* [slapos-master](https://nexedijs.erp5.net/#/test_result_module/20210629-DE509CB3/23) is failing in checkSoftware step, because:
  * wcfs is linked against system zlib (fixed in this MR)
  * the .so in the build directory have missing references. I think we don't need to check in build folders and also liblibgolang is missing, but it's not a problem because of the way we load dynamically at runtime, so I suggest changing checkSoftware in nexedi/slapos.core!317
* [gitlab](https://nexedijs.erp5.net/#/test_result_module/20210629-DE509CB3/10) is failing for some time because mimemagic have been yanked from rubygems. This is a minimal change to get the test running again, to prevent other problems to sneak in while we don't have tests

See merge request nexedi/slapos!1007
parents 452e8f78 9c4479ee
Pipeline #16401 failed with stage
in 0 seconds
...@@ -38,6 +38,12 @@ GO = ${go:exe} ...@@ -38,6 +38,12 @@ GO = ${go:exe}
# wcfs needs this: # wcfs needs this:
[gowork] [gowork]
cpkgpath += ${zlib:location}/lib/pkgconfig cpkgpath += ${zlib:location}/lib/pkgconfig
[wendelin.core-env]
# `pkg-config --libs zlib` emits only -L, but not -Wl,-rpath
# better set it via gowork:environment when "VAR += ..." support is there
# environment +=
# CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
CGO_LDFLAGS += -Wl,-rpath=${zlib:location}/lib
[wendelin.core-repository] [wendelin.core-repository]
......
...@@ -134,7 +134,7 @@ git-executable = ${git:location}/bin/git ...@@ -134,7 +134,7 @@ git-executable = ${git:location}/bin/git
<= git-repository <= git-repository
repository = https://lab.nexedi.com/nexedi/gitlab-ce.git repository = https://lab.nexedi.com/nexedi/gitlab-ce.git
# 9.5.10 + NXD patches: # 9.5.10 + NXD patches:
revision = v9.5.10-8-gc290e22a08cb revision = v9.5.10-9-g69b0ffae00bf
location = ${buildout:parts-directory}/gitlab location = ${buildout:parts-directory}/gitlab
[gitlab-shell-repository] [gitlab-shell-repository]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment