Compose teuthology master branch and use beanstalk

Compose teuthology version that uses beanstalk.

Signed-off-by: Kamoltat Sirivadhna <ksirivad@redhat.com>

diff --git a/Dockerfile b/Dockerfile
index 09c6c68f138baab8094b694384342e26ac15e31f..887bb44719cb2421038f890c7c2e69719a50f808 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update && apt-get install -y \
     git qemu-utils python3-dev libssl-dev ipmitool \
     python3-pip python3-virtualenv vim \
     libev-dev libvirt-dev libffi-dev \
-    libyaml-dev lsb-release && apt-get \ 
+    libyaml-dev lsb-release beanstalkd && apt-get \
     clean all
 RUN mkdir ../archive_dir
 RUN mkdir log

diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml
index 849e9c69c46a3af2992e32a713882ad5949787a8..259cf9bdd9755e5d6668adc600c3b6cf2b13708f 100644 (file)
--- a/docs/docker-compose/docker-compose.yml
+++ b/docs/docker-compose/docker-compose.yml
@@ -51,6 +51,13 @@ services:
         retries: 2
     ports:
         - 8081:8081
+  beanstalk:
+        build: ../../beanstalk/alpine
+        depends_on:
+            pulpito:
+                condition: service_healthy
+        ports:
+            - "11300:11300"
   teuthology:
     build: ./teuthology
     depends_on:
@@ -58,10 +65,4 @@ services:
             condition: service_healthy
     links:
         - paddles
-  beanstalk:
-        build: ../../beanstalk/alpine
-        depends_on:
-            pulpito:
-                condition: service_healthy
-        ports:
-            - "11300:11300"
\ No newline at end of file
+        - beanstalk
\ No newline at end of file

diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index c5934d88db01db554d5cd99792c29963a765634d..92ae606e8f47c8658e8523631bff44d47afc6541 100755 (executable)
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -1,15 +1,12 @@
 #!/bin/bash
+# Clone paddles and teuthology
+
 git clone https://github.com/ceph/paddles.git
 cd paddles
-git fetch origin pull/94/head:wip-amathuria-removing-beanstalkd
-git checkout wip-amathuria-removing-beanstalkd
 cd ../
 git clone https://github.com/ceph/teuthology.git
-cd teuthology
-git fetch origin pull/1650/head:wip-amathuria-replace-beanstalkd-paddles
-git fetch origin pull/94/head:wip-amathuria-removing-beanstalkd
-git checkout wip-amathuria-replace-beanstalkd-paddles
-cd ..
+
+# Check for .teuthology.yaml file and copy it to teuthology
 if [ -f ".teuthology.yaml" ]; 
 then
     cp .teuthology.yaml teuthology/.
@@ -18,6 +15,8 @@ else
     exit 1
 fi
 
-# until the branch we check out above has a Dockerfile of its own
+# Copy Docker file into teuthology
 cp ../../Dockerfile teuthology/.
+
+# docker-compose
 docker-compose up --build