OPSEXP-1145: Fix ansible deployment using python 2 (#216)

* Fix ansible deployment using python 2 * Change name of directory from TRAVIS_BUILD to TRAVIS_JOB and cleanup old files
Alfresco · Dec 1, 2021 · 97a4ba9 · 97a4ba9
1 parent 013181a
commit 97a4ba9
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -301,7 +301,7 @@ jobs:
     - stage: Verification
       name: Single Machine Integration checks
       env:
-        - COMMON_COMMANDS="source ~/.bash_profile;export NEXUS_USERNAME=$NEXUS_USERNAME; export NEXUS_PASSWORD=\"$NEXUS_PASSWORD\";export MOLECULE_NO_LOG=false;export EC2_REGION=us-east-1;export TRAVIS_BRANCH=$TRAVIS_BRANCH;export TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER;export MOLECULE_EPHEMERAL_DIRECTORY=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir; export ANSIBLE_CONFIG=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir/ansible.cfg; cd /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single" # pragma: allowlist secret
+        - COMMON_COMMANDS="source ~/.bash_profile;export NEXUS_USERNAME=$NEXUS_USERNAME; export NEXUS_PASSWORD=\"$NEXUS_PASSWORD\";export MOLECULE_NO_LOG=false;export EC2_REGION=us-east-1;export TRAVIS_BRANCH=$TRAVIS_BRANCH;export TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER;export TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER;export MOLECULE_EPHEMERAL_DIRECTORY=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir; export ANSIBLE_CONFIG=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir/ansible.cfg; cd /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single" # pragma: allowlist secret
         - ANSIBLE_FORCE_COLOR=true
       before_install:
         - openssl aes-256-cbc -K $encrypted_6c8b9ee48a27_key -iv $encrypted_6c8b9ee48a27_iv -in alfresco-ansible.pem.enc -out /tmp/dbp-ansible -d
@@ -311,21 +311,23 @@ jobs:
         - git clone --depth 1 --branch $DTAS_VERSION https://$GITHUB_TOKEN@github.com/Alfresco/alfresco-deployment-test-automation-scripts.git dtas
       script:
         - ssh-keyscan $control_machine_ip >> ~/.ssh/known_hosts
-        - ssh ec2-user@$control_machine_ip "mkdir -p /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir/"
-        - rsync -r --delete-after --quiet $TRAVIS_BUILD_DIR/ ec2-user@$control_machine_ip:/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single
-        - ssh ec2-user@$control_machine_ip "source ~/.bash_profile; mkdir -p /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir/"
+        - ssh ec2-user@$control_machine_ip "mkdir -p /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir/"
+        - rsync -r --delete-after --quiet $TRAVIS_BUILD_DIR/ ec2-user@$control_machine_ip:/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single
+        - ssh ec2-user@$control_machine_ip "source ~/.bash_profile; mkdir -p /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single/molecule_temp_dir/"
         - if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[keep env]"* ]]; then ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;export KEEP_ENV=true;molecule create -s ec2"; else ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;export KEEP_ENV=false;molecule create -s ec2"; fi
         - ssh ec2-user@$control_machine_ip "$COMMON_COMMANDS;python molecule/ec2/dynamic_inventory.py"
         - export TESTHOST=$(ssh ec2-user@$control_machine_ip "$COMMON_COMMANDS;cat molecule_temp_dir/instance_config.yml | yq .[].address -r")
-        - ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS; ansible-playbook playbooks/acs.yml -i /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single/inventory_ssh.yml -e \"@/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment-single/tests/test-extra-vars.yml\""
+        - ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS; ansible-playbook playbooks/acs.yml -i /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single/inventory_ssh.yml -e \"@/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment-single/tests/test-extra-vars.yml\""
         - echo "wait for repo to be up" && sleep 5m
         - ssh ec2-user@$control_machine_ip "$COMMON_COMMANDS; sed -i 's+TEST_URL+http://$TESTHOST+g' tests/test-config.json ; cd dtas; pytest --tb=line --configuration ../tests/test-config.json tests/ -s"
         - if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[keep env]"* ]]; then ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;molecule destroy -s ec2"; fi
+      after_script:
+        - ssh ec2-user@$control_machine_ip "rm -rf /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/"
     - stage: Verification
       name: Multi Machine Integration checks
       env:
         - ANSIBLE_FORCE_COLOR=true
-        - COMMON_COMMANDS="source ~/.bash_profile;export NEXUS_USERNAME=$NEXUS_USERNAME;export NEXUS_PASSWORD=\"$NEXUS_PASSWORD\";export MOLECULE_NO_LOG=false;export EC2_REGION=us-east-1;export TRAVIS_BRANCH=$TRAVIS_BRANCH;export TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER;export MOLECULE_EPHEMERAL_DIRECTORY=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment/molecule_temp_dir_m; export ANSIBLE_CONFIG=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment/molecule_temp_dir_m/ansible.cfg; cd /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment" # pragma: allowlist secret
+        - COMMON_COMMANDS="source ~/.bash_profile;export NEXUS_USERNAME=$NEXUS_USERNAME;export NEXUS_PASSWORD=\"$NEXUS_PASSWORD\";export MOLECULE_NO_LOG=false;export EC2_REGION=us-east-1;export TRAVIS_BRANCH=$TRAVIS_BRANCH;export TRAVIS_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER;export TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER;export MOLECULE_EPHEMERAL_DIRECTORY=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment/molecule_temp_dir_m; export ANSIBLE_CONFIG=/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment/molecule_temp_dir_m/ansible.cfg; cd /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment" # pragma: allowlist secret
       before_install:
         - openssl aes-256-cbc -K $encrypted_6c8b9ee48a27_key -iv $encrypted_6c8b9ee48a27_iv -in alfresco-ansible.pem.enc -out /tmp/dbp-ansible -d
         - eval "$(ssh-agent -s)"
@@ -334,16 +336,18 @@ jobs:
         - git clone --depth 1 --branch $DTAS_VERSION https://$GITHUB_TOKEN@github.com/Alfresco/alfresco-deployment-test-automation-scripts.git dtas
       script:
         - ssh-keyscan $control_machine_ip >> ~/.ssh/known_hosts
-        - ssh ec2-user@$control_machine_ip "mkdir -p /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/"
-        - rsync -r --delete-after --quiet $TRAVIS_BUILD_DIR ec2-user@$control_machine_ip:/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER
+        - ssh ec2-user@$control_machine_ip "mkdir -p /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/"
+        - rsync -r --delete-after --quiet $TRAVIS_BUILD_DIR ec2-user@$control_machine_ip:/opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER
         - ssh ec2-user@$control_machine_ip "source ~/.bash_profile"
         - if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[keep env]"* ]]; then ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;export KEEP_ENV=true;molecule create -s ec2multi"; else ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;export KEEP_ENV=false;molecule create -s ec2multi"; fi
         - ssh ec2-user@$control_machine_ip "$COMMON_COMMANDS;python molecule/ec2multi/dynamic_inventory.py"
         - export TESTHOST=$(ssh ec2-user@$control_machine_ip "$COMMON_COMMANDS;cat inventory_ssh.yml | yq .all.children.nginx.hosts.nginx_1.ansible_host -r")
-        - ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;ansible-playbook playbooks/acs.yml -i /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER/alfresco-ansible-deployment/inventory_ssh.yml -e \"@tests/test-extra-vars.yml\""
+        - ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;ansible-playbook playbooks/acs.yml -i /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/alfresco-ansible-deployment/inventory_ssh.yml -e \"@tests/test-extra-vars.yml\""
         - echo "wait for repo to be up" && sleep 5m
         - ssh ec2-user@$control_machine_ip "$COMMON_COMMANDS; sed -i 's+TEST_URL+http://$TESTHOST+g' tests/test-config.json; cd dtas; pytest --tb=line --configuration ../tests/test-config.json tests/ -s"
         - if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[keep env]"* ]]; then ssh -tt ec2-user@$control_machine_ip "$COMMON_COMMANDS;molecule destroy -s ec2multi"; fi
+      after_script:
+        - ssh ec2-user@$control_machine_ip "rm -rf /opt/buildacs/$TRAVIS_BRANCH/$TRAVIS_JOB_NUMBER/"
     - stage: Release Stage 
       name: Release
       script:

diff --git a/docs/README.md b/docs/README.md
@@ -72,7 +72,7 @@ The table below shows the version of the components deployed by the playbook for
 
 | Component | 7.1 Enterprise | 7.0.N Enterprise | 6.2.N Enterprise | Community |
 |-|-|-|-|-|
-| OpenJDK | 11.0.12 | 11.0.12 | 11.0.12 | 11.0.12 |
+| OpenJDK | 11.0.13 | 11.0.13 | 11.0.13 | 11.0.13 |
 | Apache Tomcat | 9.0.52 | 9.0.52 | 8.5.65 | 9.0.52 |
 | PostgreSQL | 13.x | 13.x | 11.x | 13.x |
 | Apache ActiveMQ | 5.16.1 | 5.16.1 | 5.15.14 | 5.16.1 |

diff --git a/roles/postgres/vars/CentOS7.yml b/roles/postgres/vars/CentOS7.yml
@@ -1,4 +1,4 @@
 postgresql_packages:
   - postgresql{{ dependencies_version.postgres_major_version }}-server
   - postgresql{{ dependencies_version.postgres_major_version }}
-  - python{{ '3' if ansible_python_version.split('.')[0] == '3' }}-psycopg2
+  - python{{ '3' if ansible_python_version.split('.')[0] == '3' else '' }}-psycopg2
diff --git a/roles/postgres/vars/CentOS8.yml b/roles/postgres/vars/CentOS8.yml
@@ -1,5 +1,5 @@
 postgresql_packages:
   - postgresql{{ dependencies_version.postgres_major_version }}-server
   - postgresql{{ dependencies_version.postgres_major_version }}
-  - python3-psycopg2
+  - python{{ '3' if ansible_python_version.split('.')[0] == '3' else '' }}-psycopg2
   - glibc-langpack-en
diff --git a/roles/postgres/vars/Debian.yml b/roles/postgres/vars/Debian.yml
@@ -1,6 +1,6 @@
 postgresql_packages:
   - postgresql-{{ dependencies_version.postgres_major_version }}
-  - python3-psycopg2
+  - python{{ '3' if ansible_python_version.split('.')[0] == '3' else '' }}-psycopg2
 
 postgresql_service: postgresql
 postgresql_conf_path: /etc/postgresql/{{ dependencies_version.postgres_major_version }}/main
diff --git a/roles/postgres/vars/RedHat7.yml b/roles/postgres/vars/RedHat7.yml
@@ -1,4 +1,4 @@
 postgresql_packages:
   - postgresql{{ dependencies_version.postgres_major_version }}-server
   - postgresql{{ dependencies_version.postgres_major_version }}
-  - python{{ '3' if ansible_python_version.split('.')[0] == '3' }}-psycopg2
+  - python{{ '3' if ansible_python_version.split('.')[0] == '3' else '' }}-psycopg2
diff --git a/roles/postgres/vars/RedHat8.yml b/roles/postgres/vars/RedHat8.yml
@@ -1,5 +1,5 @@
 postgresql_packages:
   - postgresql{{ dependencies_version.postgres_major_version }}-server
   - postgresql{{ dependencies_version.postgres_major_version }}
-  - python3-psycopg2
+  - python{{ '3' if ansible_python_version.split('.')[0] == '3' else '' }}-psycopg2
   - glibc-langpack-en