From d589ce2978ed2b1b45cd0c48ce32fec7d1bf42df Mon Sep 17 00:00:00 2001 From: jefferyfry Date: Thu, 6 Aug 2020 19:49:31 -0700 Subject: [PATCH] Updated documentation. Add new tests for software upgrades. --- Ansible/README.md | 21 ++- Ansible/pipelines.yaml | 4 +- Ansible/test/aws/playbook-ha-install.yaml | 22 +-- Ansible/test/aws/playbook-ha-upgrade.yaml | 172 ++++++++++++++++++ Ansible/test/aws/runAwsInstall.sh | 11 +- Ansible/test/aws/runAwsUpgrade.sh | 14 ++ .../.gradle/5.2.1/fileChanges/last-build.bin | Bin 1 -> 0 bytes .../.gradle/5.2.1/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .../test/tests/.gradle/5.2.1/gc.properties | 0 .../6.5/executionHistory/executionHistory.bin | Bin 134537 -> 138306 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/6.5/fileHashes/fileHashes.bin | Bin 23547 -> 23647 bytes .../.gradle/6.5/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../tests/src/test/resources/testenv.yaml | 6 +- .../tests/src/test/resources/testenv_tpl.yaml | 6 + 16 files changed, 237 insertions(+), 19 deletions(-) create mode 100644 Ansible/test/aws/playbook-ha-upgrade.yaml create mode 100755 Ansible/test/aws/runAwsUpgrade.sh delete mode 100644 Ansible/test/tests/.gradle/5.2.1/fileChanges/last-build.bin delete mode 100644 Ansible/test/tests/.gradle/5.2.1/fileHashes/fileHashes.lock delete mode 100644 Ansible/test/tests/.gradle/5.2.1/gc.properties create mode 100644 Ansible/test/tests/src/test/resources/testenv_tpl.yaml diff --git a/Ansible/README.md b/Ansible/README.md index 4527053..71d07d9 100644 --- a/Ansible/README.md +++ b/Ansible/README.md @@ -12,6 +12,7 @@ This Ansible directory consists of the following directories that support the JF | collection_version | artifactory_version | xray_version | |--------------------|---------------------|--------------| +| 1.0.8 | 7.6.1 | 3.5.2 | | 1.0.7 | 7.6.1 | 3.5.2 | | 1.0.6 | 7.5.0 | 3.3.0 | | 1.0.6 | 7.4.3 | 3.3.0 | @@ -84,11 +85,29 @@ ansible_ssh_common_args: '-o ProxyCommand="ssh -o StrictHostKeyChecking=no -A us eg. ansible_ssh_common_args: '-o ProxyCommand="ssh -o StrictHostKeyChecking=no -A ubuntu@{{ azureDeployment.deployment.outputs.lbIp.value }} -W %h:%p"' ``` +## Upgrades +The Artifactory and Xray roles support software updates. To use a role to perform a software update only, use the _artifactory_upgrade_only_ or _xray_upgrade_only_ variable and specify the version. See the following example. + +``` +- hosts: artifactory + vars: + artifactory_version: "{{ lookup('env', 'artifactory_version_upgrade') }}" + artifactory_upgrade_only: true + roles: + - artifactory + +- hosts: xray + vars: + xray_version: "{{ lookup('env', 'xray_version_upgrade') }}" + xray_upgrade_only: true + roles: + - xray +``` ## Building the Collection Archive 1. Go to the [ansible_collections/jfrog/installers directory](ansible_collections/jfrog/installers). 2. Update the galaxy.yml meta file as needed. Update the version. -3. Build the archive. +3. Build the archive. (Requires Ansible 2.9+) ``` ansible-galaxy collection build ``` diff --git a/Ansible/pipelines.yaml b/Ansible/pipelines.yaml index 9f7a18f..8c22a43 100644 --- a/Ansible/pipelines.yaml +++ b/Ansible/pipelines.yaml @@ -53,7 +53,7 @@ pipelines: - ls - eval $(ssh-agent -s) - ssh-add <(echo "$int_ansiblePrivateKey_key") - - ansible-playbook Ansible/test/aws/playbook.yaml + - ansible-playbook Ansible/test/aws/playbook-ha-install.yaml onComplete: - echo "AWS Ansible playbook complete." - name: execute_azure_ansible_playbook @@ -105,6 +105,6 @@ pipelines: - eval $(ssh-agent -s) - ssh-add <(echo "$int_ansiblePrivateKey_key") - az login --service-principal -u "$clientId" -p "$clientSecret" --tenant "$tenantId" - - ansible-playbook Ansible/test/azure/playbook.yaml + - ansible-playbook Ansible/test/azure/playbook-ha-install.yaml onComplete: - echo "Azure Ansible playbook complete." \ No newline at end of file diff --git a/Ansible/test/aws/playbook-ha-install.yaml b/Ansible/test/aws/playbook-ha-install.yaml index a859072..ba59220 100644 --- a/Ansible/test/aws/playbook-ha-install.yaml +++ b/Ansible/test/aws/playbook-ha-install.yaml @@ -37,9 +37,7 @@ db_url: "jdbc:postgresql://{{ AWSDeployment.stack_outputs.DBInstancePrivate }}:5432/artifactory" server_name: "{{ AWSDeployment.stack_outputs.ALBHostName }}" artifactory_is_primary: true - artifactory_license1: "{{ lookup('env', 'artifactory_license1') }}" - artifactory_license2: "{{ lookup('env', 'artifactory_license2') }}" - artifactory_license3: "{{ lookup('env', 'artifactory_license3') }}" + artifactory_license_file: "{{ lookup('env', 'artifactory_license_file') }}" groups: - artifactory @@ -84,6 +82,11 @@ - { db_name: "xraydb", db_owner: "xray" } groups: database + - name: Set up test environment file + copy: + src: ../tests/src/test/resources/testenv_tpl.yaml + dest: ../tests/src/test/resources/testenv.yaml + - name: Set up test environment url replace: path: ../tests/src/test/resources/testenv.yaml @@ -140,12 +143,7 @@ - name: Test hosts: localhost tasks: - - name: Run tests - shell: - cmd: ./gradlew clean unified_test - chdir: ../tests/ - - name: Cleanup and delete stack - cloudformation: - stack_name: "{{ lookup('env', 'stack_name') }}" - region: "us-east-1" - state: "absent" \ No newline at end of file + - name: Run tests + shell: + cmd: ./gradlew clean unified_test + chdir: ../tests/ \ No newline at end of file diff --git a/Ansible/test/aws/playbook-ha-upgrade.yaml b/Ansible/test/aws/playbook-ha-upgrade.yaml new file mode 100644 index 0000000..fa97c16 --- /dev/null +++ b/Ansible/test/aws/playbook-ha-upgrade.yaml @@ -0,0 +1,172 @@ +--- +- name: Provision AWS test infrastructure + hosts: localhost + tasks: + - shell: 'pwd' + register: cmd + + - debug: + msg: "{{ cmd.stdout }}" + - name: Create AWS test system + cloudformation: + stack_name: "{{ lookup('env', 'stack_name') }}" + state: "present" + region: "us-east-1" + disable_rollback: true + template: "{{ lookup('env', 'cfn_template') }}" + template_parameters: + SSHKeyName: "{{ lookup('env', 'ssh_public_key_name') }}" + tags: + Stack: "{{ lookup('env', 'stack_name') }}" + register: AWSDeployment + - name: Get AWS deployment details + debug: + var: AWSDeployment + + - name: Add bastion + add_host: + hostname: "{{ AWSDeployment.stack_outputs.BastionInstancePublic }}" + groups: bastion + ansible_user: "ubuntu" + - name: Add new RT primary to host group + add_host: + hostname: "{{ AWSDeployment.stack_outputs.RTPriInstancePrivate }}" + ansible_user: "ubuntu" + ansible_ssh_common_args: '-o ProxyCommand="ssh -o StrictHostKeyChecking=no -A ubuntu@{{ AWSDeployment.stack_outputs.BastionInstancePublic }} -W %h:%p"' + artifactory_version: "{{ lookup('env', 'artifactory_version') }}" + db_url: "jdbc:postgresql://{{ AWSDeployment.stack_outputs.DBInstancePrivate }}:5432/artifactory" + server_name: "{{ AWSDeployment.stack_outputs.ALBHostName }}" + artifactory_is_primary: true + artifactory_license_file: "{{ lookup('env', 'artifactory_license_file') }}" + groups: + - artifactory + + - name: Add RT secondaries to host group + add_host: + hostname: "{{ AWSDeployment.stack_outputs.RTSecInstancePrivate }}" + ansible_user: "ubuntu" + ansible_ssh_common_args: '-o ProxyCommand="ssh -o StrictHostKeyChecking=no -A ubuntu@{{ AWSDeployment.stack_outputs.BastionInstancePublic }} -W %h:%p"' + artifactory_version: "{{ lookup('env', 'artifactory_version') }}" + db_url: "jdbc:postgresql://{{ AWSDeployment.stack_outputs.DBInstancePrivate }}:5432/artifactory" + server_name: "{{ AWSDeployment.stack_outputs.ALBHostName }}" + artifactory_is_primary: false + groups: + - artifactory + + - name: Add xrays to host group + add_host: + hostname: "{{ AWSDeployment.stack_outputs.XrayInstancePrivate }}" + ansible_user: "ubuntu" + ansible_ssh_common_args: '-o ProxyCommand="ssh -o StrictHostKeyChecking=no -A ubuntu@{{ AWSDeployment.stack_outputs.BastionInstancePublic }} -W %h:%p"' + xray_version: "{{ lookup('env', 'xray_version') }}" + jfrog_url: "http://{{ AWSDeployment.stack_outputs.ALBHostName }}" + master_key: "{{ lookup('env', 'master_key') }}" + join_key: "{{ lookup('env', 'join_key') }}" + db_type: "postgresql" + db_driver: "org.postgresql.Driver" + db_user: "xray" + db_password: "xray" + db_url: "postgres://{{ AWSDeployment.stack_outputs.DBInstancePrivate }}:5432/xraydb?sslmode=disable" + groups: xray + + - name: Add DBs to host group + add_host: + hostname: "{{ AWSDeployment.stack_outputs.DBInstancePrivate }}" + ansible_user: "ubuntu" + ansible_ssh_common_args: '-o ProxyCommand="ssh -o StrictHostKeyChecking=no -A ubuntu@{{ AWSDeployment.stack_outputs.BastionInstancePublic }} -W %h:%p"' + db_users: + - { db_user: "artifactory", db_password: "Art1fAct0ry" } + - { db_user: "xray", db_password: "xray" } + dbs: + - { db_name: "artifactory", db_owner: "artifactory" } + - { db_name: "xraydb", db_owner: "xray" } + groups: database + + - name: Set up test environment file + copy: + src: ../tests/src/test/resources/testenv_tpl.yaml + dest: ../tests/src/test/resources/testenv.yaml + + - name: Set up test environment url + replace: + path: ../tests/src/test/resources/testenv.yaml + regexp: 'urlval' + replace: "http://{{ AWSDeployment.stack_outputs.ALBHostName }}" + + - name: Set up test environment external_ip + replace: + path: ../tests/src/test/resources/testenv.yaml + regexp: 'ipval' + replace: "{{ AWSDeployment.stack_outputs.ALBHostName }}" + + - name: Set up test environment rt_password + replace: + path: ../tests/src/test/resources/testenv.yaml + regexp: 'passval' + replace: "password" + + - name: show testenv.yaml + debug: var=item + with_file: + - ../tests/src/test/resources/testenv.yaml + + - name: Wait 300 seconds for port 22 + wait_for: + port: 22 + host: "{{ AWSDeployment.stack_outputs.BastionInstancePublic }}" + delay: 10 + + - debug: + msg: "Unified URL is at http://{{ AWSDeployment.stack_outputs.ALBHostName }}" + +# apply roles to install software +- hosts: database + roles: + - postgres + +- hosts: artifactory + vars: + artifactory_ha_enabled: true + master_key: "{{ lookup('env', 'master_key') }}" + join_key: "{{ lookup('env', 'join_key') }}" + db_download_url: "https://jdbc.postgresql.org/download/postgresql-42.2.12.jar" + db_type: "postgresql" + db_driver: "org.postgresql.Driver" + db_user: "artifactory" + db_password: "Art1fAct0ry" + roles: + - artifactory + +- hosts: xray + roles: + - xray + +- name: Test + hosts: localhost + tasks: + - name: Run tests + shell: + cmd: ./gradlew clean unified_test + chdir: ../tests/ + +# Now upgrade +- name: Upgrade + hosts: localhost + tasks: + - pause: + prompt: "Proceed to upgrade?" + minutes: 5 + +- hosts: artifactory + vars: + artifactory_version: "{{ lookup('env', 'artifactory_version_upgrade') }}" + artifactory_upgrade_only: true + roles: + - artifactory + +- hosts: xray + vars: + xray_version: "{{ lookup('env', 'xray_version_upgrade') }}" + xray_upgrade_only: true + roles: + - xray \ No newline at end of file diff --git a/Ansible/test/aws/runAwsInstall.sh b/Ansible/test/aws/runAwsInstall.sh index fa8da2a..6b1a735 100755 --- a/Ansible/test/aws/runAwsInstall.sh +++ b/Ansible/test/aws/runAwsInstall.sh @@ -1,3 +1,12 @@ #!/usr/bin/env bash -ansible-playbook Ansible/test/aws/playbook.yaml \ No newline at end of file +export stack_name=$1 +export cfn_template="~/git/JFrog-Cloud-Installers/Ansible/infra/aws/lb-rt-xray-ha-ubuntu16.json" +export ssh_public_key_name=jeff-ansible +export artifactory_license_file="~/Desktop/artifactory.cluster.license" +export master_key=d8c19a03036f83ea45f2c658e22fdd60 +export join_key=d8c19a03036f83ea45f2c658e22fdd61 +export ansible_user=ubuntu +export artifactory_version="7.4.3" +export xray_version="3.4.0" +ansible-playbook Ansible/test/aws/playbook-ha-install.yaml \ No newline at end of file diff --git a/Ansible/test/aws/runAwsUpgrade.sh b/Ansible/test/aws/runAwsUpgrade.sh new file mode 100755 index 0000000..191fe97 --- /dev/null +++ b/Ansible/test/aws/runAwsUpgrade.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash + +export stack_name=$1 +export cfn_template="~/git/JFrog-Cloud-Installers/Ansible/infra/aws/lb-rt-xray-ha-ubuntu16.json" +export ssh_public_key_name=jeff-ansible +export artifactory_license_file="~/Desktop/artifactory.cluster.license" +export master_key=d8c19a03036f83ea45f2c658e22fdd60 +export join_key=d8c19a03036f83ea45f2c658e22fdd61 +export ansible_user=ubuntu +export artifactory_version="7.4.3" +export xray_version="3.4.0" +export artifactory_version_upgrade="7.6.1" +export xray_version_upgrade="3.5.2" +ansible-playbook Ansible/test/aws/playbook-ha-upgrade.yaml \ No newline at end of file diff --git a/Ansible/test/tests/.gradle/5.2.1/fileChanges/last-build.bin b/Ansible/test/tests/.gradle/5.2.1/fileChanges/last-build.bin deleted file mode 100644 index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1 IcmZPo000310RR91 diff --git a/Ansible/test/tests/.gradle/5.2.1/fileHashes/fileHashes.lock b/Ansible/test/tests/.gradle/5.2.1/fileHashes/fileHashes.lock deleted file mode 100644 index ceb38cc88f35a1c014e507af3e74c5a2b2a4d9d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 ScmZQ}3FHq8H4&T700jUW9s)c7 diff --git a/Ansible/test/tests/.gradle/5.2.1/gc.properties b/Ansible/test/tests/.gradle/5.2.1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/Ansible/test/tests/.gradle/6.5/executionHistory/executionHistory.bin b/Ansible/test/tests/.gradle/6.5/executionHistory/executionHistory.bin index 1da42b951b5fd0483d7c7691fd96842c9e3011af..e2cad615aa20e05d9d93ed30e5eaeff02eecb843 100644 GIT binary patch delta 2612 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 vKS<{r7l+iD?MF0Q* literal 17 UcmZRM7fj##ct)i-0|eLu04-tz;s5{u diff --git a/Ansible/test/tests/.gradle/6.5/fileHashes/fileHashes.bin b/Ansible/test/tests/.gradle/6.5/fileHashes/fileHashes.bin index 3aa0a9b101df2e66112d98e4f62fcd7680a4fd39..4782416b9284b5378b3efee4203b97ffa38586a0 100644 GIT binary patch delta 2068 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 diff --git a/Ansible/test/tests/.gradle/6.5/fileHashes/fileHashes.lock b/Ansible/test/tests/.gradle/6.5/fileHashes/fileHashes.lock index e9ea2c51355652fd0632b55daeffbc9d70e78624..88d74f8a5f662cf7d32cabf6de40aef0c028fca1 100644 GIT binary patch literal 17 VcmZSH8q%`ie|zM81~6cK2LL{@1@Zs@ literal 17 VcmZSH8q%`ie|zM81~6cX0RTQ41zi9D diff --git a/Ansible/test/tests/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Ansible/test/tests/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 866a35e263bf740ab576771f7f7d0e929d5abe51..cad006e55b2e84f4a8120ac1e8e4e23de64b82a5 100644 GIT binary patch literal 17 UcmZQ}3cSGg=7je*1_;;=05vQHApigX literal 17 UcmZQ}3cSGg=7je*1_%fN05r)2z5oCK diff --git a/Ansible/test/tests/src/test/resources/testenv.yaml b/Ansible/test/tests/src/test/resources/testenv.yaml index 55ff648..3480812 100644 --- a/Ansible/test/tests/src/test/resources/testenv.yaml +++ b/Ansible/test/tests/src/test/resources/testenv.yaml @@ -1,6 +1,6 @@ artifactory: - url: urlval - external_ip: ipval + url: http://Ansib-Appli-1NLZU3V2AGK49-291976964.us-east-1.elb.amazonaws.com + external_ip: Ansib-Appli-1NLZU3V2AGK49-291976964.us-east-1.elb.amazonaws.com distribution: artifactory_ha rt_username: admin - rt_password: passval \ No newline at end of file + rt_password: password \ No newline at end of file diff --git a/Ansible/test/tests/src/test/resources/testenv_tpl.yaml b/Ansible/test/tests/src/test/resources/testenv_tpl.yaml new file mode 100644 index 0000000..55ff648 --- /dev/null +++ b/Ansible/test/tests/src/test/resources/testenv_tpl.yaml @@ -0,0 +1,6 @@ +artifactory: + url: urlval + external_ip: ipval + distribution: artifactory_ha + rt_username: admin + rt_password: passval \ No newline at end of file