Add molecule tests for prebuilt client

galaxyproject · Jul 11, 2024 · cc1a9b0 · cc1a9b0
1 parent 51bed8f
commit cc1a9b0
Show file tree

Hide file tree

Showing 6 changed files with 125 additions and 46 deletions.
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         scenario:
           - default
+          - prebuilt_client
         from-image:
           - centos:7
           - rockylinux:8
@@ -34,6 +35,10 @@ jobs:
             galaxy-version: '21.01'
           - from-image: ubuntu:22.04
             galaxy-version: '22.01'
+          - scenario: prebuilt_client
+            galaxy-version: '22.01'
+          - scenario: prebuilt_client
+            galaxy-version: '22.05'       
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/molecule/_common/_inc_pre_tasks.yml b/molecule/_common/_inc_pre_tasks.yml
@@ -0,0 +1,46 @@
+---
+- name: Install dependencies (yum)
+  yum:
+    # For completeness this should include git, but on EL7 we install a newer git from SCL in the Dockerfile to deal
+    # with automatic line ending conversion in the default git 1.8 breaking idempotence
+    #name: [sudo, git, make, bzip2]
+    name: [sudo, make, bzip2]
+  when: ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", "<")
+- name: Install dependencies (dnf)
+  dnf:
+    name: [sudo, git, make, bzip2]
+  when: ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", ">=")
+- name: Install dependencies (apt)
+  apt:
+    name:
+      - sudo
+      - git
+      - make
+      - python3-venv
+      - python3-setuptools
+      - python3-dev
+      - python3-psycopg2
+      - gcc
+      - acl
+      - gnutls-bin
+      - libmagic-dev
+  when: ansible_os_family == "Debian"
+
+# This is to cheat at idempotence, which will fail if a commit is merged between converge and idempotence.
+- name: Check whether server dir exists
+  stat:
+    path: "{{ galaxy_root }}/server"
+  register: __molecule_dir_check
+- name: Collect current commit id
+  git:
+    clone: false
+    depth: "{{ galaxy_clone_depth }}"
+    dest: "{{ galaxy_root }}/server"
+    repo: https://github.com/galaxyproject/galaxy.git
+  changed_when: false
+  become: "{{ __molecule_dir_check.stat.exists }}"
+  become_user: "{{ galaxy_privsep_user }}"
+  register: __molecule_git_check
+- name: Set galaxy_commit_id
+  set_fact:
+    galaxy_commit_id: "{{ __molecule_git_check.before or ((__galaxy_version == 'dev') | ternary('dev', 'release_' ~ __galaxy_version)) }}"
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -26,51 +26,6 @@
         conda_auto_init: false
     pip_virtualenv_command: /usr/bin/python3 -m venv
   pre_tasks:
-
-    - name: Install dependencies (yum)
-      yum:
-        # For completeness this should include git, but on EL7 we install a newer git from SCL in the Dockerfile to deal
-        # with automatic line ending conversion in the default git 1.8 breaking idempotence
-        #name: [sudo, git, make, bzip2]
-        name: [sudo, make, bzip2]
-      when: ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", "<")
-    - name: Install dependencies (dnf)
-      dnf:
-        name: [sudo, git, make, bzip2]
-      when: ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", ">=")
-    - name: Install dependencies (apt)
-      apt:
-        name:
-          - sudo
-          - git
-          - make
-          - python3-venv
-          - python3-setuptools
-          - python3-dev
-          - python3-psycopg2
-          - gcc
-          - acl
-          - gnutls-bin
-          - libmagic-dev
-      when: ansible_os_family == "Debian"
-
-    # This is to cheat at idempotence, which will fail if a commit is merged between converge and idempotence.
-    - name: Check whether server dir exists
-      stat:
-        path: "{{ galaxy_root }}/server"
-      register: __molecule_dir_check
-    - name: Collect current commit id
-      git:
-        clone: false
-        depth: "{{ galaxy_clone_depth }}"
-        dest: "{{ galaxy_root }}/server"
-        repo: https://github.com/galaxyproject/galaxy.git
-      changed_when: false
-      become: "{{ __molecule_dir_check.stat.exists }}"
-      become_user: "{{ galaxy_privsep_user }}"
-      register: __molecule_git_check
-    - name: Set galaxy_commit_id
-      set_fact:
-        galaxy_commit_id: "{{ __molecule_git_check.before or ((__galaxy_version == 'dev') | ternary('dev', 'release_' ~ __galaxy_version)) }}"
+    - include_tasks: "../_common/_inc_pre_tasks.yml"
   roles:
     - role: galaxyproject.galaxy
diff --git a/molecule/prebuilt_client/converge.yml b/molecule/prebuilt_client/converge.yml
@@ -0,0 +1,31 @@
+---
+- name: Converge
+  hosts: all
+  vars:
+    galaxy_client_use_prebuilt: true # This scenario tests with the prebuilt client
+    __galaxy_version: "{{ lookup('env', 'GALAXY_VERSION') }}"
+    galaxy_create_user: yes
+    galaxy_manage_paths: yes
+    galaxy_manage_clone: yes
+    galaxy_manage_download: no
+    galaxy_manage_existing: no
+    galaxy_manage_systemd: yes
+    # role default is < 22.05
+    galaxy_manage_gravity: "{{ false if __galaxy_major_version is version('22.01', '<') else true }}"
+    galaxy_systemd_mode: "{{ 'mule' if __galaxy_major_version is version('22.01', '<') else 'gravity' }}"
+    galaxy_config_style: yaml
+    galaxy_layout: root-dir
+    galaxy_root: /srv/galaxy
+    galaxy_separate_privileges: yes
+    galaxy_user: galaxy
+    galaxy_group: galaxy
+    galaxy_privsep_user: gxpriv
+    galaxy_config:
+      galaxy:
+        database_connection: sqlite:///{{ galaxy_mutable_data_dir }}/universe.sqlite
+        conda_auto_init: false
+    pip_virtualenv_command: /usr/bin/python3 -m venv
+  pre_tasks:
+    - include_tasks: "../_common/_inc_pre_tasks.yml"
+  roles:
+    - role: galaxyproject.galaxy
diff --git a/molecule/prebuilt_client/molecule.yml b/molecule/prebuilt_client/molecule.yml
@@ -0,0 +1,26 @@
+---
+dependency:
+  name: galaxy
+  options:
+    force: false  # don't fetch every time
+    role-file: molecule/_common/requirements.yml
+    requirements-file: molecule/_common/requirements.yml
+driver:
+  name: docker
+platforms:
+  - name: galaxy-scenario-prebuilt_client
+    image: ${FROM_IMAGE:-centos:7}
+    platform: linux/amd64
+    # override default sleep loop, use Dockerfile CMD
+    command: ""
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    privileged: true
+    dockerfile: ../_common/Dockerfile.j2
+    pre_build_image: false
+provisioner:
+  name: ansible
+  env:
+    GALAXY_VERSION: ${GALAXY_VERSION:-dev}
+verifier:
+  name: ansible
diff --git a/molecule/prebuilt_client/verify.yml b/molecule/prebuilt_client/verify.yml
@@ -0,0 +1,16 @@
+---
+
+- name: Verify
+  hosts: all
+  vars:
+    __galaxy_version: "{{ lookup('env', 'GALAXY_VERSION') }}"
+  tasks:
+    - name: Check version
+      uri:
+        url: http://localhost:8080/api/version
+      register: response
+      failed_when: response.status != 200 or (__galaxy_version != 'dev' and response.json.version_major != lookup('env', 'GALAXY_VERSION'))
+      # this is just to wait until the server is up, we can stop retrying on any response
+      until: response.status > 0
+      retries: 60
+      delay: 1