diff --git a/playbooks/amq_broker.yml b/playbooks/amq_broker.yml index 4f08dd2..416a4d6 100644 --- a/playbooks/amq_broker.yml +++ b/playbooks/amq_broker.yml @@ -6,8 +6,9 @@ upstream_collection_name: amq downstream_namespace: redhat upstream_namespace: middleware_automation - project_git_url: https://github.com/ansible-middleware/amq.git + project_git_url: "{{ lookup('env', 'GIT_REPOSITORY_URL') | default('https://github.com/ansible-middleware/amq.git', true) }}" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } post_processors_replacements: diff --git a/playbooks/amq_streams.yml b/playbooks/amq_streams.yml index 66ec840..345682d 100644 --- a/playbooks/amq_streams.yml +++ b/playbooks/amq_streams.yml @@ -5,7 +5,8 @@ downstream_name: amq_streams downstream_namespace: redhat upstream_namespace: middleware_automation - project_git_url: https://github.com/ansible-middleware/amq_streams.git + project_git_url: "{{ lookup('env', 'GIT_REPOSITORY_URL') | default('https://github.com/ansible-middleware/amq_streams.git', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } post_processors_replacements: diff --git a/playbooks/data_grid.yml b/playbooks/data_grid.yml index 271b900..82cbd28 100644 --- a/playbooks/data_grid.yml +++ b/playbooks/data_grid.yml @@ -5,8 +5,9 @@ downstream_name: data_grid downstream_namespace: 'redhat' upstream_namespace: 'middleware_automation' - project_git_url: https://github.com/ansible-middleware/infinispan.git + project_git_url: "{{ lookup('env', 'GIT_REPOSITORY_URL') | default('https://github.com/ansible-middleware/infinispan.git', true) }}" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main') }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } post_processors_replacements: diff --git a/playbooks/eap.yml b/playbooks/eap.yml index ee8a82d..b5df4d3 100644 --- a/playbooks/eap.yml +++ b/playbooks/eap.yml @@ -7,6 +7,7 @@ upstream_namespace: 'middleware_automation' project_git_url: "{{ lookup('env', 'GIT_REPOSITORY_URL') | default('https://github.com/ansible-middleware/wildfly.git', true) }}" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" case_insensitive_match: true upstream_downstream_collections_map: diff --git a/playbooks/jbcs.yml b/playbooks/jbcs.yml index 58dd1c6..719e09f 100644 --- a/playbooks/jbcs.yml +++ b/playbooks/jbcs.yml @@ -7,6 +7,7 @@ upstream_namespace: 'middleware_automation' project_git_url: "https://github.com/ansible-middleware/{{ upstream_name }}.git" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } galaxy: diff --git a/playbooks/quarkus.yml b/playbooks/quarkus.yml index 273e970..a75fe05 100644 --- a/playbooks/quarkus.yml +++ b/playbooks/quarkus.yml @@ -7,6 +7,7 @@ upstream_namespace: 'middleware_automation' project_git_url: "{{ lookup('env', 'GIT_REPOSITORY_URL') | default('https://github.com/ansible-middleware/quarkus.git', true) }}" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" case_insensitive_match: true upstream_downstream_collections_map: diff --git a/playbooks/rhbk.yml b/playbooks/rhbk.yml index 3f2c1a1..39c3168 100644 --- a/playbooks/rhbk.yml +++ b/playbooks/rhbk.yml @@ -13,8 +13,9 @@ project_root_folder: "{{ lookup('env', 'PWD') }}/upstream/keycloak.git" excluded_roles_from_downstream: - roles/keycloak - project_git_url: https://github.com/ansible-middleware/keycloak.git + project_git_url: "{{ lookup('env', 'GIT_REPOSITORY_URL') | default('https://github.com/ansible-middleware/keycloak.git', true) }}" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } post_processors_replacements: [] diff --git a/playbooks/runtimes_common.yml b/playbooks/runtimes_common.yml index 3c8af85..3d9086f 100644 --- a/playbooks/runtimes_common.yml +++ b/playbooks/runtimes_common.yml @@ -7,6 +7,7 @@ upstream_namespace: 'middleware_automation' project_git_url: "https://github.com/ansible-middleware/{{ upstream_name }}.git" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } - { upstream_name: 'fedora.linux_system_roles', downstream_name: 'redhat.rhel_system_roles' } diff --git a/playbooks/sso.yml b/playbooks/sso.yml index dc159f1..e7d629e 100644 --- a/playbooks/sso.yml +++ b/playbooks/sso.yml @@ -7,6 +7,7 @@ upstream_namespace: 'middleware_automation' project_git_url: "https://github.com/ansible-middleware/{{ upstream_name }}.git" project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}" + gitdescribe_galaxy_version: "{{ true if lookup('env', 'RELEASE_NAME') == '' else false }}" upstream_downstream_collections_map: - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' } - { upstream_name: 'middleware_automation.wildfly', downstream_name: 'redhat.eap' }