Skip to content

Commit 3bd26a3

Browse files
authored
Fix yor yq queries (#1848)
Closes #1847 Signed-off-by: Marc Schöchlin <schoechlin@osb-alliance.com>
1 parent ed6d018 commit 3bd26a3

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ VERSION_OPENSTACK ?= 2023.1
99
TERRAFORM ?= terraform
1010
TERRAFORM_BLUEPRINT ?= testbed-default
1111

12-
ANSIBLE_COLLECTION_COMMONS_PATH := $(shell yq '.repositories.ansible-collection-commons.path' playbooks/vars/repositories.yml)
13-
ANSIBLE_COLLECTION_COMMONS_REPO := $(shell yq '.repositories.ansible-collection-commons.repo' playbooks/vars/repositories.yml)
14-
ANSIBLE_COLLECTION_SERVICES_PATH := $(shell yq '.repositories.ansible-collection-services.path' playbooks/vars/repositories.yml)
15-
ANSIBLE_COLLECTION_SERVICES_REPO := $(shell yq '.repositories.ansible-collection-services.repo' playbooks/vars/repositories.yml)
16-
REPOSITORY_SERVER := $(shell yq '.repository_server' playbooks/vars/repositories.yml)
17-
TERRAFORM_BASE_PATH := $(shell yq '.repositories.terraform-base.path' playbooks/vars/repositories.yml)
18-
TERRAFORM_BASE_REPO := $(shell yq '.repositories.terraform-base.repo' playbooks/vars/repositories.yml)
12+
ANSIBLE_COLLECTION_COMMONS_PATH := $(shell yq '.repositories."ansible-collection-commons".path' playbooks/vars/repositories.yml)
13+
ANSIBLE_COLLECTION_COMMONS_REPO := $(shell yq '.repositories."ansible-collection-commons".repo' playbooks/vars/repositories.yml)
14+
ANSIBLE_COLLECTION_SERVICES_PATH := $(shell yq '.repositories."ansible-collection-services".path' playbooks/vars/repositories.yml)
15+
ANSIBLE_COLLECTION_SERVICES_REPO := $(shell yq '.repositories."ansible-collection-services".repo' playbooks/vars/repositories.yml)
16+
REPOSITORY_SERVER := $(shell yq '."repository_server"' playbooks/vars/repositories.yml)
17+
TERRAFORM_BASE_PATH := $(shell yq '.repositories."terraform-base".path' playbooks/vars/repositories.yml)
18+
TERRAFORM_BASE_REPO := $(shell yq '.repositories."terraform-base".repo' playbooks/vars/repositories.yml)
1919
TESTBED_PATH := $(shell yq '.repositories.testbed.path' playbooks/vars/repositories.yml)
2020
TESTBED_REPO := $(shell yq '.repositories.testbed.repo' playbooks/vars/repositories.yml)
2121

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
- bugfix for yq queries

0 commit comments

Comments
 (0)