[FIX] Packaging: RedHat: prompt overriden in docker
RPM packages did not pass the tests because the centos prompt changed and thus did not match the regexp anymore. We now explicitely specify the prompt in our Dockerfiles to prevent such issues.
This commit is contained in:
parent
e40a6fd325
commit
9c8c534c19
|
@ -42,8 +42,10 @@ RUN yum install -d 0 -e 0 epel-release -y && \
|
||||||
|
|
||||||
RUN easy_install pyPdf vatnumber pydot psycogreen
|
RUN easy_install pyPdf vatnumber pydot psycogreen
|
||||||
|
|
||||||
# Manual start of postgres
|
# Postgres configuration
|
||||||
RUN mkdir -p /var/lib/postgres/data
|
RUN mkdir -p /var/lib/postgres/data
|
||||||
RUN chown -R postgres:postgres /var/lib/postgres/data
|
RUN chown -R postgres:postgres /var/lib/postgres/data
|
||||||
RUN su postgres -c "initdb -D /var/lib/postgres/data -E UTF-8"
|
RUN su postgres -c "initdb -D /var/lib/postgres/data -E UTF-8"
|
||||||
RUN cp /usr/share/pgsql/postgresql.conf.sample /var/lib/postgres/data/postgresql.conf
|
RUN cp /usr/share/pgsql/postgresql.conf.sample /var/lib/postgres/data/postgresql.conf
|
||||||
|
|
||||||
|
RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
|
||||||
|
|
|
@ -68,3 +68,5 @@ RUN apt-get update -qq && \
|
||||||
COPY requirements.txt /opt/release/requirements.txt
|
COPY requirements.txt /opt/release/requirements.txt
|
||||||
|
|
||||||
RUN pip install -r /opt/release/requirements.txt
|
RUN pip install -r /opt/release/requirements.txt
|
||||||
|
|
||||||
|
RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
|
||||||
|
|
|
@ -120,7 +120,7 @@ class OdooDocker(object):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.log_file = NamedTemporaryFile(mode='w+b', prefix="bash", suffix=".txt", delete=False)
|
self.log_file = NamedTemporaryFile(mode='w+b', prefix="bash", suffix=".txt", delete=False)
|
||||||
self.port = 8069 # TODO sle: reliable way to get a free port?
|
self.port = 8069 # TODO sle: reliable way to get a free port?
|
||||||
self.prompt_re = '(\r\nroot@|bash-).*# '
|
self.prompt_re = '\[root@nightly-tests\] #'
|
||||||
self.timeout = 600
|
self.timeout = 600
|
||||||
|
|
||||||
def system(self, command):
|
def system(self, command):
|
||||||
|
|
Loading…
Reference in New Issue