Commit 84e13551 authored by Ophélie Gagnard's avatar Ophélie Gagnard

obs: Fix a setuptool version related bug.

parent df303081
Pipeline #24643 passed with stage
in 0 seconds
...@@ -43,7 +43,7 @@ wget https://lab.nexedi.com/nexedi/slapos.buildout/raw/master/bootstrap/bootstra ...@@ -43,7 +43,7 @@ wget https://lab.nexedi.com/nexedi/slapos.buildout/raw/master/bootstrap/bootstra
echo "[buildout]" > buildout.cfg # dummy .cfg file only for boostraping echo "[buildout]" > buildout.cfg # dummy .cfg file only for boostraping
echo "Bootsrapping buildout..." echo "Bootsrapping buildout..."
python3 -S bootstrap.py \ python3 -S bootstrap.py \
--setuptools-version 44.1.0 \ --setuptools-version "$OLD_SETUPTOOLS_VERSION" \
--setuptools-to-dir eggs --setuptools-to-dir eggs
# 10) Get newest version of zc.buildout and setuptools. # 10) Get newest version of zc.buildout and setuptools.
......
...@@ -12,7 +12,6 @@ export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python ...@@ -12,7 +12,6 @@ export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python
export GIT_REPOSITORY=https://lab.nexedi.com/Ophelie/slapos.git export GIT_REPOSITORY=https://lab.nexedi.com/Ophelie/slapos.git
export GIT_BRANCH_OR_COMMIT=fluent-bit_tmp export GIT_BRANCH_OR_COMMIT=fluent-bit_tmp
export BUILDOUT_RELATIVE_PATH=component/fluent-bit/dep--fluent-bit.cfg export BUILDOUT_RELATIVE_PATH=component/fluent-bit/dep--fluent-bit.cfg
export SETUPTOOLS_VERSION=44.1.1
export ZC_BUILDOUT_VERSION=2.7.1+slapos019 export ZC_BUILDOUT_VERSION=2.7.1+slapos019
export OBS_COMMIT_MSG="Yet another push in OBS." export OBS_COMMIT_MSG="Yet another push in OBS."
...@@ -7,7 +7,6 @@ export MAINTAINER_EMAIL="ophelie.gagnard@nexedi.com" ...@@ -7,7 +7,6 @@ export MAINTAINER_EMAIL="ophelie.gagnard@nexedi.com"
export TARGET_DIR="/" export TARGET_DIR="/"
export BUILDOUT_RELATIVE_PATH=component/lunzip/buildout.cfg export BUILDOUT_RELATIVE_PATH=component/lunzip/buildout.cfg
export SETUPTOOLS_VERSION=44.1.1
export ZC_BUILDOUT_VERSION=2.7.1+slapos019 export ZC_BUILDOUT_VERSION=2.7.1+slapos019
export OBS_PROJECT=home:oph.nxd export OBS_PROJECT=home:oph.nxd
......
...@@ -8,7 +8,6 @@ export GIT_BRANCH_OR_COMMIT=1.0.279 ...@@ -8,7 +8,6 @@ export GIT_BRANCH_OR_COMMIT=1.0.279
export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python (>= 2.7), python3 (>= 3.7), python3-dev (>= 3.7), golang (>= 2:1.15~1), cmake (>= 3.18)" export PACKAGE_BUILD_DEPENDENCIES="debhelper (>= 4.1.16), chrpath, wget, python (>= 2.7), python3 (>= 3.7), python3-dev (>= 3.7), golang (>= 2:1.15~1), cmake (>= 3.18)"
export BUILDOUT_RELATIVE_PATH=software/mca/dep--mca--static.cfg export BUILDOUT_RELATIVE_PATH=software/mca/dep--mca--static.cfg
export SETUPTOOLS_VERSION=44.1.1
export ZC_BUILDOUT_VERSION=2.7.1+slapos019 export ZC_BUILDOUT_VERSION=2.7.1+slapos019
export OBS_COMMIT_MSG="Yet another push in OBS." export OBS_COMMIT_MSG="Yet another push in OBS."
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