diff --git a/.envrc b/.envrc index 86b658b02..7565d7c30 100644 --- a/.envrc +++ b/.envrc @@ -4,7 +4,7 @@ export AWS_REGION=eu-west-1 export MOLECULE_IT_AWS_VPC_SUBNET_ID=subnet-6bdd4223 export BRANCH_NAME=local export BUILD_NUMBER=1 -export DTAS_VERSION=v1.5.3 +export DTAS_VERSION=v1.6.0 export MOLECULE_IT_ID=$(echo "$LOGNAME" | sha256sum | cut -c1-6) ANSIBLE_VAULT_PASSWORD_FILE=$(expand_path ./.vault_pass.txt) export ANSIBLE_VAULT_PASSWORD_FILE diff --git a/.github/workflows/enteprise.yml b/.github/workflows/enteprise.yml index e44af78d7..60f6b4199 100644 --- a/.github/workflows/enteprise.yml +++ b/.github/workflows/enteprise.yml @@ -19,7 +19,7 @@ on: workflow_dispatch: env: - DTAS_VERSION: v1.5.5 + DTAS_VERSION: v1.6.0 BUILD_NUMBER: ${{ github.run_id }} PY_COLORS: 1 PYTHONUNBUFFERED: 1 diff --git a/molecule/docker_enterprise/verify.yml b/molecule/docker_enterprise/verify.yml deleted file mode 100644 index b17dc0e02..000000000 --- a/molecule/docker_enterprise/verify.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- name: Verify - hosts: all - gather_facts: true - tasks: - - name: Populate services facts - ansible.builtin.service_facts: - - - name: Check services up - ansible.builtin.assert: - quiet: true - that: - - ansible_facts.services['nginx.service'].state == "running" - - ansible_facts.services['alfresco-audit-storage.service'].state == "running" diff --git a/molecule/elasticsearch/molecule.yml b/molecule/elasticsearch/molecule.yml index 71a1e74fc..18ca8a1aa 100644 --- a/molecule/elasticsearch/molecule.yml +++ b/molecule/elasticsearch/molecule.yml @@ -47,6 +47,6 @@ provisioner: playbooks: prepare: ../default/prepare.yml converge: ../../playbooks/acs.yml - verify: ../multimachine/verify.yml + verify: ../default/verify.yml verifier: name: ansible diff --git a/tests/test-config.json b/tests/test-config.json index 785c32ce2..3bd79b1b1 100644 --- a/tests/test-config.json +++ b/tests/test-config.json @@ -33,6 +33,10 @@ }, "adw": { "version": "5.2.0" + }, + "aas": { + "audit_host": "http://localhost:8083", + "elasticsearch_host": "http://localhost:9200" } } }