Use new AT branch (TMP)

compose/Makefile

@@ -120,6 +120,9 @@ at-rebuilt:
 at-logs:
 	docker-compose -f docker-compose.yml -f docker-compose.acceptance-tests.yml logs -f selenium-hub selenium-firefox selenium-chrome archivematica-acceptance-tests
 
+at-stop:
+	docker-compose -f docker-compose.yml -f docker-compose.acceptance-tests.yml stop selenium-hub selenium-firefox selenium-chrome archivematica-acceptance-tests
+
 db:
 	mysql -h127.0.0.1 --port=62001 -uroot -p12345
 

compose/README.md

@@ -27,7 +27,7 @@ may work:
     $ sudo apt install -y build-essential python-dev git
     $ sudo pip install -U ansible docker-compose
 
-And install Docker CE following [https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/](these instructions).
+And install Docker CE following [these instructions](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/).
 
 ## Installation
 
@@ -84,16 +84,23 @@ container is using the newest image, e.g.:
 
 ### Acceptance tests
 
-*TODO* see `docker-compose.acceptance-tests.yml`
+There is an extra Compose file called `docker-compose.acceptance-tests.yml` that defines some extra services to run our acceptance tests, e.g. Selenium Standalone Server, Selenium Chrome Node or Selenium Firefox Node. In order to run the tests use the following command:
 
-OLD BUT RELEVANT?
-```
-These logs are also saved in log files that can be queried from the docker host itself (in the ../src/archivematica-acceptance-tests/ directory):
+    $ make at-run
 
-- last-acceptance-test.log: Log from the tests last run.
-- output-acceptance-tests-firefox.log : Log from all the firefox tests run.
-- output-acceptance-tests-chrome.log : Log from all the chrome tests run.
-```
+There are some extra targets that you may find useful:
+
+- `make at-check`: make sure that both Firefox and Chrome are working.
+- `make at-logs`: watch the logs generated by the containers for debugging purposes.
+- `make at-rebuilt`: ensure that all the containers are rebuilt and restarted.
+- `make at-restarted`: ensure that all the containers are restarted.
+- `make at-run-chrome`: run the tests using just Chrome.
+- `make at-run-firefox`: run the tests using just Firefox.
+- `make at-stop`: stop services - because browsers are not particularly lightweight.
+
+The sources of the [acceptance tests](../src/archivematica-acceptance-tests)
+have been made available inside Docker using volumes so you can edit them and
+the changes will apply immediately.
 
 ## Resetting the environment