Modify test directory references in automation

The test directories need to reflect the new
project test heirarchy, otherwise they will not be
able to access the correct resources.

.gitignore

@@ -1,9 +1,9 @@
 .DS_Store
 
 # We don't care about test outputs
-tests/junit/
-tests/conjur.pem
-tests/access_token
+tests/*/junit/
+tests/*/conjur.pem
+tests/*/access_token
 
 # We should never check in pycache directories
 **/__pycache__/

Jenkinsfile

@@ -21,16 +21,18 @@ pipeline {
     stage('Run tests') {
       parallel {
         stage("Test Ansible-Conjur-Collection") {
+          agent { label 'executor-v2-large' }
+
           steps {
             sh './ci/test.sh conjur'
-            junit 'tests/junit/*'
+            junit 'tests/conjur/junit/*'
           }
         }
 
         stage("Test Ansible-Conjur-Host-Identity") {
           steps {
             sh './ci/test.sh conjur-host-identity'
-            junit 'tests/junit/*'
+            junit 'tests/conjur-host-identity/junit/*'
           }
         }
       }

tests/conjur-host-identity/docker-compose.yml

@@ -12,8 +12,8 @@ services:
       CONJUR_CUSTOM_AUTHN_API_KEY: ${CUSTOM_CONJUR_AUTHN_API_KEY}
       COMPOSE_PROJECT_NAME: ${COMPOSE_PROJECT_NAME}
     volumes:
-      - ..:/conjurinc/cyberark.conjur-host-identity/
-      - ../tests:/conjurinc/tests/
+      - ../..:/conjurinc/cyberark.conjur-host-identity/
+      - ../conjur-host-identity:/conjurinc/tests/
       - /var/run/docker.sock:/var/run/docker.sock
   pg:
     image: postgres:9.3

tests/conjur/docker-compose.yml

@@ -15,8 +15,8 @@ services:
     links:
       - "conjur_https:conjur-https"
     volumes:
-      - ../plugins:/root/.ansible/plugins
-      - ..:/cyberark
+      - ../../plugins:/root/.ansible/plugins
+      - ../..:/cyberark
       - /var/run/docker.sock:/var/run/docker.sock
 
   pg:

tests/conjur/test.sh

@@ -95,7 +95,7 @@ function run_test_case {
   fi
 
   docker-compose exec -T ansible bash -exc "
-    cd tests
+    cd tests/conjur
 
     # If env vars were provided, load them
     if [ -e 'test_cases/${test_case}/env' ]; then