default main when repo branch is empty

ansible-middleware · Aug 26, 2024 · 0c88810 · 0c88810
1 parent 24255f4
commit 0c88810
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/playbooks/amq_broker.yml b/playbooks/amq_broker.yml
@@ -7,6 +7,7 @@
     downstream_namespace: redhat
     upstream_namespace: middleware_automation
     project_git_url: https://github.com/ansible-middleware/amq.git
+    project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}"
     upstream_downstream_collections_map:
       - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' }
     post_processors_replacements:

diff --git a/playbooks/jbcs.yml b/playbooks/jbcs.yml
@@ -6,7 +6,7 @@
     downstream_namespace: 'redhat'
     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') }}"
+    project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}"
     upstream_downstream_collections_map:
       - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' }
     galaxy:

diff --git a/playbooks/jws.yml b/playbooks/jws.yml
@@ -6,6 +6,7 @@
     downstream_namespace: 'redhat'
     upstream_namespace: 'middleware_automation'
     project_git_url: https://github.com/ansible-middleware/jws.git
+    project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}"
     upstream_downstream_collections_map:
       - { upstream_name: 'middleware_automation.common', downstream_name: 'redhat.runtimes_common' }
       - { upstream_name: 'middleware_automation.jws', downstream_name: 'redhat.jws' }

diff --git a/playbooks/rhbk.yml b/playbooks/rhbk.yml
@@ -14,7 +14,7 @@
     excluded_roles_from_downstream:
       - roles/keycloak
     project_git_url: https://github.com/ansible-middleware/keycloak.git
-    project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main') }}"
+    project_git_version: "{{ lookup('env', 'GIT_REPOSITORY_BRANCH') | default('main', true) }}"
     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
@@ -6,6 +6,7 @@
     downstream_namespace: 'redhat'
     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) }}"
     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' }