Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
slapos
Commits
52632323
Commit
52632323
authored
Nov 10, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Plain Diff
Detect usages of system python in software release tests
See merge request
!1278
parents
4527a6e3
84ecc0a5
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
6 deletions
+28
-6
component/ca-certificates/buildout.cfg
component/ca-certificates/buildout.cfg
+1
-1
component/ca-certificates/ca-certificates-any-python.patch
component/ca-certificates/ca-certificates-any-python.patch
+1
-1
component/glib/buildout.cfg
component/glib/buildout.cfg
+2
-1
component/proxysql/buildout.cfg
component/proxysql/buildout.cfg
+2
-2
software/erp5/upgrade_test/test.py
software/erp5/upgrade_test/test.py
+1
-1
software/slapos-sr-testing/software.cfg
software/slapos-sr-testing/software.cfg
+21
-0
No files found.
component/ca-certificates/buildout.cfg
View file @
52632323
...
@@ -16,7 +16,7 @@ url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_2
...
@@ -16,7 +16,7 @@ url = http://deb.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_2
md5sum = c02582bf9ae338e558617291897615eb
md5sum = c02582bf9ae338e558617291897615eb
patch-binary = ${patch:location}/bin/patch
patch-binary = ${patch:location}/bin/patch
patches =
patches =
${:_profile_base_location_}/ca-certificates-any-python.patch#
47c2509f1346bd5af8123fb1a2751c2c
${:_profile_base_location_}/ca-certificates-any-python.patch#
c13b44dfc3157dda13a9a2ff97a9d501
${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
${:_profile_base_location_}/ca-certificates-sbin-dir.patch#0b4e7d82ce768823c01954ee41ef177b
patch-options = -p0
patch-options = -p0
configure-command = true
configure-command = true
...
...
component/ca-certificates/ca-certificates-any-python.patch
View file @
52632323
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
all:
all:
- python3 certdata2pem.py
- python3 certdata2pem.py
+ for x in
'' 2 3
; do type python$$x && break; done >/dev/null \
+ for x in
3 '' 2
; do type python$$x && break; done >/dev/null \
+ && python$$x certdata2pem.py
+ && python$$x certdata2pem.py
clean:
clean:
...
...
component/glib/buildout.cfg
View file @
52632323
...
@@ -7,6 +7,7 @@ extends =
...
@@ -7,6 +7,7 @@ extends =
../perl/buildout.cfg
../perl/buildout.cfg
../xz-utils/buildout.cfg
../xz-utils/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
../defaults.cfg
parts =
parts =
glib
glib
...
@@ -25,7 +26,7 @@ configure-options =
...
@@ -25,7 +26,7 @@ configure-options =
--disable-fam
--disable-fam
--disable-xattr
--disable-xattr
--disable-man
--disable-man
--with-python=
$PYTHON
--with-python=
python${python:version}
environment =
environment =
PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
...
...
component/proxysql/buildout.cfg
View file @
52632323
...
@@ -36,7 +36,7 @@ post-install =
...
@@ -36,7 +36,7 @@ post-install =
install -Dt %(location)s/bin %(make-targets)s
install -Dt %(location)s/bin %(make-targets)s
environment =
environment =
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${libgcrypt:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig:${gnutls:location}/lib/pkgconfig:${libgcrypt:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:
%(PATH)s:${python2.7:location}/bin
PATH=${m4:location}/bin:${libtool:location}/bin:${libgcrypt:location}/bin:${curl:location}/bin:${perl:location}/bin:${pkgconfig:location}/bin:${bzip2:location}/bin:${autoconf:location}/bin:${git:location}/bin:${automake:location}/bin:${patch:location}/bin:${cmake:location}/bin:
${python2.7:location}/bin:%(PATH)s
CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${zlib:location}/include
CXXFLAGS=-I${openssl:location}/include -I${gnutls:location}/include -I${zlib:location}/include
CFLAGS=-I${gnutls:location}/include
CFLAGS=-I${gnutls:location}/include
LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${curl:location}/lib -L${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${curl:location}/lib -L${pcre:location}/lib -L${jemalloc:location}/lib -L${libmicrohttpd:location}/lib
LDFLAGS=-L${openssl:location}/lib -Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath=${curl:location}/lib -L${libtool:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -L${curl:location}/lib -L${pcre:location}/lib -L${jemalloc:location}/lib -L${libmicrohttpd:location}/lib
...
@@ -47,4 +47,4 @@ environment =
...
@@ -47,4 +47,4 @@ environment =
patch-options = -p1
patch-options = -p1
patches =
patches =
# PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
# PR #3402 (mariadb_client: backport patch to fix syntax error in cmake 3.20)
https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch
https://github.com/sysown/proxysql/commit/a3cfa56d257219f7610cd5711045bb5d84485a91.patch
#bb034744fd9b676484d34a269ab2ed07
software/erp5/upgrade_test/test.py
View file @
52632323
...
@@ -46,7 +46,7 @@ from slapos.testing.testcase import (
...
@@ -46,7 +46,7 @@ from slapos.testing.testcase import (
makeModuleSetUpAndTestCaseClass
,
makeModuleSetUpAndTestCaseClass
,
)
)
old_software_release_url
=
'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.
5
/software/erp5/software.cfg'
old_software_release_url
=
'https://lab.nexedi.com/nexedi/slapos/raw/1.0.167.
6
/software/erp5/software.cfg'
new_software_release_url
=
os
.
path
.
abspath
(
new_software_release_url
=
os
.
path
.
abspath
(
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'..'
,
'software.cfg'
))
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'..'
,
'software.cfg'
))
...
...
software/slapos-sr-testing/software.cfg
View file @
52632323
...
@@ -22,6 +22,7 @@ extends =
...
@@ -22,6 +22,7 @@ extends =
parts =
parts =
eggs/scripts
eggs/scripts
python2.7-disabled
slapos-cookbook
slapos-cookbook
template
template
...
@@ -251,6 +252,26 @@ branch = master
...
@@ -251,6 +252,26 @@ branch = master
egg = slapos.core
egg = slapos.core
setup = ${slapos.core-repository:location}
setup = ${slapos.core-repository:location}
[python2.7-disabled]
# An "intentionally broken" python2 command that should catch
# accidental usage of things like #!/usr/bin/env python2
recipe = zc.recipe.egg
# we need an egg to generate a script, use the one from this part's recipe
eggs = ${:recipe}
interpreter = python2.7
entry-points =
python=${:eggs}:ignored
python2=${:eggs}:ignored
python2.7=${:eggs}:ignored
scripts =
python
python2
python2.7
initialization =
import sys
print("Error: attempt to use system python2", file=sys.stderr)
sys.exit(2)
[python-interpreter]
[python-interpreter]
eggs +=
eggs +=
${lxml-python:egg}
${lxml-python:egg}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment