try a fix for the tests in pipelines; add collections cache

2025-12-13 08:23:06 -06:00 · 2022-09-08 12:51:58 -05:00
parent 2188338a53
commit 4d7b2c57f0
40 changed files with 175 additions and 17 deletions
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -9,6 +9,8 @@ options:
  size: 2x

 definitions:
+  caches:
+    ansible-collections: ansible_collections
  services:
    docker:
      memory: 4096
@@ -35,6 +37,8 @@ pipelines:
    - parallel:
        - step:
           name: aws_common/cw-disabled
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -44,6 +48,8 @@ pipelines:
             - pipenv run molecule test -s cw-disabled
        - step:
           name: aws_common/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -53,6 +59,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: aws_common/logs-disabled
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -62,6 +70,8 @@ pipelines:
             - pipenv run molecule test -s logs-disabled
        - step:
           name: bitbucket_config/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -71,6 +81,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: bitbucket_config/iam_elasticsearch
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -80,6 +92,8 @@ pipelines:
             - pipenv run molecule test -s iam_elasticsearch
        - step:
           name: confluence_config/aurora
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -89,6 +103,8 @@ pipelines:
             - pipenv run molecule test -s aurora
        - step:
           name: confluence_config/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -98,6 +114,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: confluence_config/password_char_escaping
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -107,6 +125,8 @@ pipelines:
             - pipenv run molecule test -s password_char_escaping
        - step:
           name: confluence_config/system_jdk
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -116,6 +136,8 @@ pipelines:
             - pipenv run molecule test -s system_jdk
        - step:
           name: diy_backup/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -125,6 +147,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: jira_config/aurora
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -134,6 +158,8 @@ pipelines:
             - pipenv run molecule test -s aurora
        - step:
           name: jira_config/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -143,6 +169,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: jira_config/jira_config_props
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -152,6 +180,8 @@ pipelines:
             - pipenv run molecule test -s jira_config_props
        - step:
           name: jira_config/password_char_escaping
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -161,6 +191,8 @@ pipelines:
             - pipenv run molecule test -s password_char_escaping
        - step:
           name: linux_common/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -170,6 +202,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: product_common/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -179,6 +213,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: product_common/system_jdk
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -188,6 +224,8 @@ pipelines:
             - pipenv run molecule test -s system_jdk
        - step:
           name: product_install/bitbucket_latest
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -197,6 +235,8 @@ pipelines:
             - pipenv run molecule test -s bitbucket_latest
        - step:
           name: product_install/confluence_latest
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -206,6 +246,8 @@ pipelines:
             - pipenv run molecule test -s confluence_latest
        - step:
           name: product_install/confluence_version_with_uppercase
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -215,6 +257,8 @@ pipelines:
             - pipenv run molecule test -s confluence_version_with_uppercase
        - step:
           name: product_install/crowd_latest
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -224,6 +268,8 @@ pipelines:
             - pipenv run molecule test -s crowd_latest
        - step:
           name: product_install/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -233,6 +279,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: product_install/jira_all
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -240,17 +288,10 @@ pipelines:
             - ./bin/install-ansible --dev
             - cd roles/product_install
             - pipenv run molecule test -s jira_all
-        - step:
-           name: product_install/jira_tarball_download_url
-           services:
-             - docker
-           script:
-             - export ANSIBLE_CONFIG=./ansible.cfg
-             - ./bin/install-ansible --dev
-             - cd roles/product_install
-             - pipenv run molecule test -s jira_tarball_download_url
        - step:
           name: product_install/jira_cached_with_downgrade
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -260,6 +301,8 @@ pipelines:
             - pipenv run molecule test -s jira_cached_with_downgrade
        - step:
           name: product_install/jira_cached_with_upgrade
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -269,6 +312,8 @@ pipelines:
             - pipenv run molecule test -s jira_cached_with_upgrade
        - step:
           name: product_install/jira_software_latest
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -278,6 +323,8 @@ pipelines:
             - pipenv run molecule test -s jira_software_latest
        - step:
           name: product_install/jira_tarball
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -285,8 +332,21 @@ pipelines:
             - ./bin/install-ansible --dev
             - cd roles/product_install
             - pipenv run molecule test -s jira_tarball
+        - step:
+           name: product_install/jira_tarball_download_url
+           caches:
+             - ansible-collections
+           services:
+             - docker
+           script:
+             - export ANSIBLE_CONFIG=./ansible.cfg
+             - ./bin/install-ansible --dev
+             - cd roles/product_install
+             - pipenv run molecule test -s jira_tarball_download_url
        - step:
           name: product_install/jira_version_from_file
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -296,6 +356,8 @@ pipelines:
             - pipenv run molecule test -s jira_version_from_file
        - step:
           name: product_install/jira_version_latest
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -305,6 +367,8 @@ pipelines:
             - pipenv run molecule test -s jira_version_latest
        - step:
           name: product_install/jira_version_override
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -314,6 +378,8 @@ pipelines:
             - pipenv run molecule test -s jira_version_override
        - step:
           name: product_install/servicedesk3
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -323,6 +389,8 @@ pipelines:
             - pipenv run molecule test -s servicedesk3
        - step:
           name: product_install/servicedesk4
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -332,6 +400,8 @@ pipelines:
             - pipenv run molecule test -s servicedesk4
        - step:
           name: product_install/servicedesk_latest
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -341,6 +411,8 @@ pipelines:
             - pipenv run molecule test -s servicedesk_latest
        - step:
           name: product_startup/bitbucket
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -350,6 +422,8 @@ pipelines:
             - pipenv run molecule test -s bitbucket
        - step:
           name: product_startup/default
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -359,6 +433,8 @@ pipelines:
             - pipenv run molecule test -s default
        - step:
           name: product_startup/startup_restart_false
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
@@ -368,6 +444,8 @@ pipelines:
             - pipenv run molecule test -s startup_restart_false
        - step:
           name: product_startup/synchrony
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
--- a/pipeline_generator/templates/bitbucket-pipelines.yml.j2
+++ b/pipeline_generator/templates/bitbucket-pipelines.yml.j2
@@ -9,6 +9,8 @@ options:
  size: 2x

 definitions:
+  caches:
+    ansible-collections: ansible_collections
  services:
    docker:
      memory: 4096
@@ -36,6 +38,8 @@ pipelines:
       {% for spath in scenario_paths %}
        - step:
           name: {{ spath.parts[2] }}/{{ spath.parts[4] }}
+           caches:
+             - ansible-collections
           services:
             - docker
           script:
--- a/roles/aws_common/molecule/cw-disabled/molecule.yml
+++ b/roles/aws_common/molecule/cw-disabled/molecule.yml
@@ -12,6 +12,8 @@ platforms:
 #   image: ubuntu:bionic
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/aws_common/molecule/default/molecule.yml
+++ b/roles/aws_common/molecule/default/molecule.yml
@@ -12,6 +12,8 @@ platforms:
 #   image: ubuntu:bionic
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/aws_common/molecule/logs-disabled/molecule.yml
+++ b/roles/aws_common/molecule/logs-disabled/molecule.yml
@@ -12,6 +12,8 @@ platforms:
 #   image: ubuntu:bionic
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/bitbucket_config/molecule/default/molecule.yml
+++ b/roles/bitbucket_config/molecule/default/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml
+++ b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/aurora/molecule.yml
+++ b/roles/confluence_config/molecule/aurora/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/default/molecule.yml
+++ b/roles/confluence_config/molecule/default/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml
+++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml
@@ -15,6 +15,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/confluence_config/molecule/system_jdk/molecule.yml
+++ b/roles/confluence_config/molecule/system_jdk/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/diy_backup/molecule/default/molecule.yml
+++ b/roles/diy_backup/molecule/default/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/aurora/molecule.yml
+++ b/roles/jira_config/molecule/aurora/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/default/molecule.yml
+++ b/roles/jira_config/molecule/default/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/jira_config_props/molecule.yml
+++ b/roles/jira_config/molecule/jira_config_props/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/jira_config/molecule/password_char_escaping/molecule.yml
+++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/linux_common/molecule/default/molecule.yml
+++ b/roles/linux_common/molecule/default/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  inventory:
    links:
      group_vars: ../../../../group_vars/
--- a/roles/product_common/molecule/default/molecule.yml
+++ b/roles/product_common/molecule/default/molecule.yml
@@ -10,5 +10,7 @@ platforms:
    image: ubuntu:bionic
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
 verifier:
  name: testinfra
--- a/roles/product_common/molecule/system_jdk/molecule.yml
+++ b/roles/product_common/molecule/system_jdk/molecule.yml
@@ -10,5 +10,7 @@ platforms:
    image: ubuntu:bionic
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
 verifier:
  name: testinfra
--- a/roles/product_install/molecule/bitbucket_latest/molecule.yml
+++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/confluence_latest/molecule.yml
+++ b/roles/product_install/molecule/confluence_latest/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml
+++ b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/crowd_latest/molecule.yml
+++ b/roles/product_install/molecule/crowd_latest/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/default/molecule.yml
+++ b/roles/product_install/molecule/default/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_all/molecule.yml
+++ b/roles/product_install/molecule/jira_all/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml
+++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    vvv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml
+++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    vvv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/jira_software_latest/molecule.yml
+++ b/roles/product_install/molecule/jira_software_latest/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_tarball/molecule.yml
+++ b/roles/product_install/molecule/jira_tarball/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml
+++ b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_version_from_file/molecule.yml
+++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_version_latest/molecule.yml
+++ b/roles/product_install/molecule/jira_version_latest/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/jira_version_override/molecule.yml
+++ b/roles/product_install/molecule/jira_version_override/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_install/molecule/servicedesk3/molecule.yml
+++ b/roles/product_install/molecule/servicedesk3/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    vv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/servicedesk4/molecule.yml
+++ b/roles/product_install/molecule/servicedesk4/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    vv: true
    skip-tags: runtime_pkg
--- a/roles/product_install/molecule/servicedesk_latest/molecule.yml
+++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml
@@ -14,6 +14,8 @@ platforms:
      - aws_node_local
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    vv: true
    skip-tags: runtime_pkg
--- a/roles/product_startup/molecule/bitbucket/molecule.yml
+++ b/roles/product_startup/molecule/bitbucket/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_startup/molecule/default/molecule.yml
+++ b/roles/product_startup/molecule/default/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory:
--- a/roles/product_startup/molecule/startup_restart_false/molecule.yml
+++ b/roles/product_startup/molecule/startup_restart_false/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  env:
    ATL_STARTUP_RESTART: "false"
  options:
--- a/roles/product_startup/molecule/synchrony/molecule.yml
+++ b/roles/product_startup/molecule/synchrony/molecule.yml
@@ -18,6 +18,8 @@ platforms:
      - nofile:262144:262144
 provisioner:
  name: ansible
+  env:
+    ANSIBLE_COLLECTIONS_PATH: "../../"
  options:
    skip-tags: runtime_pkg
  inventory: