Merge branch 'main' into mep-no-apache

Princeton-CDH · Dec 12, 2023 · 4201986 · 4201986
2 parents 4eeefaa + 1c5ac61
commit 4201986
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/roles/build_dependencies/tasks/main.yml b/roles/build_dependencies/tasks/main.yml
@@ -16,7 +16,9 @@
   apt:
     name: "{{ common_dependencies + app_dependencies }}"
     state: present
-    update_cache: true
+    # update cache fails on bionic because postgres no longer has a release
+    # only update cache on newer VMs; skip updating on older vms
+    update_cache: "{{ ansible_distribution_version != '18.04' }}"
   changed_when: false
   when: ansible_distribution == 'Ubuntu'
 

diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml
@@ -38,7 +38,9 @@
   ansible.builtin.apt:
     name: "{{ item }}"
     state: present
-    update_cache: true
+    # update cache fails on bionic because postgres no longer has a release
+    # only update cache on newer VMs; skip updating on older vms
+    update_cache: "{{ ansible_distribution_version != '18.04' }}"
   loop:
     - libpq-dev
     - python3-dev

diff --git a/roles/python/tasks/install_dependencies.yml b/roles/python/tasks/install_dependencies.yml
@@ -10,7 +10,7 @@
     virtualenv_command: python{{ python_version }} -m venv --prompt "{{ python_venv_prompt }}"
     name:
       - pip
-      - setuptools
+      # - setuptools
     state: latest
 
 - name: Downgrade setuptools if 2to3 is required

diff --git a/roles/python/tasks/install_python.yml b/roles/python/tasks/install_python.yml
@@ -23,4 +23,6 @@
       - python{{ python_version }}-venv
       - python{{ python_version }}-distutils
     state: latest
-    update_cache: true
+    # update cache fails on bionic because postgres no longer has a release
+    # only update cache on newer VMs; skip updating on older vms
+    update_cache: "{{ ansible_distribution_version != '18.04' }}"