From 8e3d60567b265d2b2235ad954e7c5e2147a0cdf2 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Tue, 2 Apr 2019 20:50:04 +0200 Subject: [PATCH] Cleanup executor specific requirements Ara and openstacksdk are installed into the ansible virtualenvs now so there is no need to pull them as executor specific dependencies. Change-Id: I3aeac278b8e1f4bb796e0f3a3f475b3c97208a85 --- Dockerfile | 3 --- setup.cfg | 3 --- 2 files changed, 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cc85b3cb4..2b474b9d37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,10 +44,7 @@ VOLUME /var/lib/zuul CMD ["/usr/local/bin/zuul"] FROM zuul as zuul-executor -COPY --from=builder /output/ /output COPY --from=builder /usr/local/lib/zuul/ /usr/local/lib/zuul -RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \ - && rm -rf /output CMD ["/usr/local/bin/zuul-executor"] diff --git a/setup.cfg b/setup.cfg index 95b33f0f29..64df46555d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,6 +54,3 @@ migrate= zuul_base = PyMySQL psycopg2-binary -zuul_executor = - ara - openstacksdk