paths and fixes

AiC-Project · Oct 31, 2016 · 232b036 · 232b036
1 parent 87c2c84
commit 232b036
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -75,7 +75,7 @@ lib/images:
 
 docker-save: services-build player-build | lib/images
 	docker save -o lib/images/services.tar aic.senza
-	docker save -o lib/images/player.tar aic.ffserver aic.xorg aic.prjdata aic.avmdata aic.sdl aic.camera aic.audio aic.sensors
+	docker save -o lib/images/player.tar aic.ffserver aic.xorg aic.prjdata aic.avmdata aic.sdl aic.camera aic.audio aic.sensors aic.adb
 
 
 #

diff --git a/README.md b/README.md
@@ -201,12 +201,10 @@ $ ./bin/vm-create path/to/image
 
 For the image path, substitute the folder containing the version of your choice:
 
-| Version         | Image Path                    |
-| --------------- | ----------------------------- |
-| Kitkat Phone    | ./lib/images/android/4/gobyp  |
-| Kitkat Tablet   | ./lib/images/android/4/gobyt  |
-| Lollipop Phone  | ./lib/images/android/5/gobyp  |
-| Lollipop Tablet | ./lib/images/android/5/gobyt  |
+| Version         | Image Path                        |
+| --------------- | --------------------------------- |
+| Kitkat Phone    | ./lib/images/android/4.4.4/gobyp  |
+| Kitkat Tablet   | ./lib/images/android/4.4.4/gobyt  |
 
 
 The new VM will be assigned a random ID. You can list the VMs with the command

diff --git a/bin/rabbitmq-create-exchanges b/bin/rabbitmq-create-exchanges
@@ -13,6 +13,7 @@ echo "Creating exchanges.."
 for vm_dir in ${AIC_HOME}/lib/vms/*; do
     vm_id=$(basename "${vm_dir}")
     echo "VM ${vm_id}"
+    sleep 5
     docker exec -ti senza /app/ats.senza/scripts/setup_rabbitmq "$vm_id"
 done
 
diff --git a/bin/vm-create b/bin/vm-create
@@ -68,7 +68,7 @@ echo "VM images copied to vm directory."
 
 ################### Setup AMQP queues ##################################
 
-docker exec -ti senza setup_rabbitmq "$vm_id"
+docker exec -ti senza /app/ats.senza/scripts/setup_rabbitmq "$vm_id"
 
 ################### Fill XML template ##################################
 

diff --git a/bin/vm-delete b/bin/vm-delete
@@ -20,7 +20,7 @@ tput setaf 6
 
 tput setaf 1
 export AIC_AVM_PREFIX="${vm_id}_"
-docker exec -ti senza teardown_rabbitmq "$vm_id"
+docker exec -ti senza /app/ats.senza/scripts/teardown_rabbitmq "$vm_id"
 docker-compose -f "${AIC_HOME}/lib/docker/run-player.yml" -p "$vm_id" down || true
 virsh destroy "$vm_id" || true
 virsh undefine "$vm_id" || true