diff --git a/.drone.jsonnet b/.drone.jsonnet index 224caab..7eb7c0b 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -38,7 +38,7 @@ local PipelineDeployment(scenario='centos7') = { name: 'ansible-molecule', image: 'thegeeklab/molecule:3', environment: { - DO_API_KEY: { from_secret: 'do_api_key' }, + HCLOUD_TOKEN: { from_secret: 'hcloud_token' }, }, commands: [ 'molecule test -s ' + scenario, diff --git a/.drone.yml b/.drone.yml index 6d6128d..17b90f8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,8 +39,8 @@ steps: commands: - molecule test -s centos7 environment: - DO_API_KEY: - from_secret: do_api_key + HCLOUD_TOKEN: + from_secret: hcloud_token trigger: ref: @@ -131,6 +131,6 @@ depends_on: --- kind: signature -hmac: 3b2238e94de95c373362a7da90f791217d1dc82582ff2f72ac640e002aa61ed0 +hmac: 66e540c49b6cf042055a69df47b4907af185a1a822a3a2d59132e794738e4894 ... diff --git a/molecule/centos7/create.yml b/molecule/centos7/create.yml index 41f112d..6c1d373 100644 --- a/molecule/centos7/create.yml +++ b/molecule/centos7/create.yml @@ -5,64 +5,66 @@ gather_facts: false no_log: "{{ molecule_no_log }}" vars: - ssh_user: root ssh_port: 22 - - keypair_name: molecule_key - keypair_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key" + ssh_user: root + ssh_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key" tasks: - - name: Create local keypair + - name: Create SSH key user: name: "{{ lookup('env', 'USER') }}" generate_ssh_key: true - ssh_key_file: "{{ keypair_path }}" - register: local_keypair + ssh_key_file: "{{ ssh_path }}" + force: true + register: generated_ssh_key - - name: Create remote keypair - digital_ocean_sshkey: - name: "{{ keypair_name }}" - ssh_pub_key: "{{ local_keypair.ssh_public_key }}" + - name: Register the SSH key name + set_fact: + ssh_key_name: "molecule-generated-{{ 12345 | random | to_uuid }}" + + - name: Register SSH key for test instance(s) + hcloud_ssh_key: + name: "{{ ssh_key_name }}" + public_key: "{{ generated_ssh_key.ssh_public_key }}" state: present - register: remote_keypair - name: Create molecule instance(s) - digital_ocean_droplet: + hcloud_server: name: "{{ item.name }}" - unique_name: true - region: "{{ item.region_id }}" - image: "{{ item.image_id }}" - size: "{{ item.size_id }}" - ssh_keys: "{{ remote_keypair.data.ssh_key.id }}" - wait: true - wait_timeout: 300 + server_type: "{{ item.server_type }}" + ssh_keys: + - "{{ ssh_key_name }}" + volumes: "{{ item.volumes | default(omit) }}" + image: "{{ item.image }}" + location: "{{ item.location | default(omit) }}" + datacenter: "{{ item.datacenter | default(omit) }}" + user_data: "{{ item.user_data | default(omit) }}" + api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}" state: present register: server - loop: "{{ molecule_yml.platforms }}" + with_items: "{{ molecule_yml.platforms }}" async: 7200 poll: 0 - name: Wait for instance(s) creation to complete async_status: jid: "{{ item.ansible_job_id }}" - register: digitalocean_jobs - until: digitalocean_jobs.finished + register: hetzner_jobs + until: hetzner_jobs.finished retries: 300 - loop: "{{ server.results }}" + with_items: "{{ server.results }}" # Mandatory configuration for Molecule to function. - name: Populate instance config dict set_fact: instance_conf_dict: { - 'instance': "{{ item.data.droplet.name }}", - 'address': "{{ item.data.ip_address }}", + 'instance': "{{ item.hcloud_server.name }}", + 'ssh_key_name': "{{ ssh_key_name }}", + 'address': "{{ item.hcloud_server.ipv4_address }}", 'user': "{{ ssh_user }}", 'port': "{{ ssh_port }}", - 'identity_file': "{{ keypair_path }}", - 'droplet_id': "{{ item.data.droplet.id }}", - 'ssh_key_id': "{{ remote_keypair.data.ssh_key.id }}", - } - loop: "{{ digitalocean_jobs.results }}" + 'identity_file': "{{ ssh_path }}", } + with_items: "{{ hetzner_jobs.results }}" register: instance_config_dict when: server.changed | bool @@ -83,5 +85,8 @@ host: "{{ item.address }}" search_regex: SSH delay: 10 - timeout: 320 - loop: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}" + with_items: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}" + + - name: Wait for VM to settle down + pause: + seconds: 30 diff --git a/molecule/centos7/destroy.yml b/molecule/centos7/destroy.yml index 19c8c93..ecf2ed3 100644 --- a/molecule/centos7/destroy.yml +++ b/molecule/centos7/destroy.yml @@ -5,8 +5,9 @@ gather_facts: false no_log: "{{ molecule_no_log }}" tasks: - - block: - - name: Populate instance config + - name: Populate the instance config + block: + - name: Populate instance config from file set_fact: instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}" skip_instances: false @@ -17,12 +18,12 @@ skip_instances: true - name: Destroy molecule instance(s) - digital_ocean_droplet: + hcloud_server: name: "{{ item.instance }}" - id: "{{ item.droplet_id }}" + api_token: "{{ lookup('env', 'HCLOUD_TOKEN') }}" state: absent register: server - loop: "{{ instance_conf | flatten(levels=1) }}" + with_items: "{{ instance_conf }}" when: not skip_instances async: 7200 poll: 0 @@ -30,16 +31,18 @@ - name: Wait for instance(s) deletion to complete async_status: jid: "{{ item.ansible_job_id }}" - register: digitalocean_jobs - until: digitalocean_jobs.finished + register: hetzner_jobs + until: hetzner_jobs.finished retries: 300 - loop: "{{ server.results }}" + with_items: "{{ server.results }}" - - name: Delete remote keypair - digital_ocean_sshkey: - fingerprint: "{{ item.ssh_key_id }}" + - name: Remove registered SSH key + hcloud_ssh_key: + name: "{{ instance_conf[0].ssh_key_name }}" state: absent - loop: "{{ instance_conf | flatten(levels=1) }}" + when: + - not skip_instances + - (instance_conf | default([])) | length > 0 # must contain at least one instance # Mandatory configuration for Molecule to function. diff --git a/molecule/centos7/molecule.yml b/molecule/centos7/molecule.yml index 89b7ac9..6cc403a 100644 --- a/molecule/centos7/molecule.yml +++ b/molecule/centos7/molecule.yml @@ -8,9 +8,8 @@ driver: name: delegated platforms: - name: centos7-scan2mail - region_id: fra1 - image_id: centos-7-x64 - size_id: s-1vcpu-1gb + image: centos-7 + server_type: cx11 lint: | /usr/local/bin/flake8 provisioner: diff --git a/molecule/centos7/prepare.yml b/molecule/centos7/prepare.yml index 4b18d48..183f4d3 100644 --- a/molecule/centos7/prepare.yml +++ b/molecule/centos7/prepare.yml @@ -3,7 +3,13 @@ hosts: all gather_facts: false tasks: - - name: Install python for Ansible - raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal) + - name: Bootstrap python for Ansible + raw: | + command -v python3 python || ( + (test -e /usr/bin/dnf && sudo dnf install -y python3) || + (test -e /usr/bin/apt && (apt -y update && apt install -y python-minimal)) || + (test -e /usr/bin/yum && sudo yum -y -qq install python3) || + echo "Warning: Python not boostrapped due to unknown platform." + ) become: true changed_when: false