From 9c8c534c198f3c3b3e7b17d9f1457ddacd974057 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 20 Jan 2015 16:46:08 +0100
Subject: [PATCH] [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.
---
setup/package.dfcentos | 6 ++++--
setup/package.dfdebian | 2 ++
setup/package.py | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/setup/package.dfcentos b/setup/package.dfcentos
index cd494534c512..1ad8141c8872 100644
--- a/setup/package.dfcentos
+++ b/setup/package.dfcentos
@@ -42,8 +42,10 @@ RUN yum install -d 0 -e 0 epel-release -y && \
RUN easy_install pyPdf vatnumber pydot psycogreen
-# Manual start of postgres
+# Postgres configuration
RUN mkdir -p /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 cp /usr/share/pgsql/postgresql.conf.sample /var/lib/postgres/data/postgresql.conf
\ No newline at end of file
+RUN cp /usr/share/pgsql/postgresql.conf.sample /var/lib/postgres/data/postgresql.conf
+
+RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index 8afcad6431b3..f59233e4db43 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -68,3 +68,5 @@ RUN apt-get update -qq && \
COPY requirements.txt /opt/release/requirements.txt
RUN pip install -r /opt/release/requirements.txt
+
+RUN echo "PS1=\"[\u@nightly-tests] # \"" > ~/.bashrc
diff --git a/setup/package.py b/setup/package.py
index 7de6b48fba80..ce0db21bcf9b 100755
--- a/setup/package.py
+++ b/setup/package.py
@@ -120,7 +120,7 @@ class OdooDocker(object):
def __init__(self):
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.prompt_re = '(\r\nroot@|bash-).*# '
+ self.prompt_re = '\[root@nightly-tests\] #'
self.timeout = 600
def system(self, command):
--
GitLab