Skip to content

Commit 4d04000

Browse files
mbaldessarimbaldessari
authored
Merge pull request #489 from mbaldessari/recursive-clone
Use --recurse-submodules when cloning
2 parents 7f22447 + dd6be56 commit 4d04000

6 files changed

Lines changed: 10 additions & 10 deletions

‎clustergroup/templates/imperative/_helpers.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
6666
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
6767
mkdir /git/{repo,home};
68-
git clone --single-branch --branch {{ $.Values.global.targetRevision }} --depth 1 -- "${URL}" /git/repo;
68+
git clone --recurse-submodules --single-branch --branch {{ $.Values.global.targetRevision }} --depth 1 -- "${URL}" /git/repo;
6969
chmod 0770 /git/{repo,home};
7070
{{- end }}
7171

@@ -109,7 +109,7 @@
109109
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
110110
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
111111
mkdir /git/{repo,home};
112-
git clone --single-branch --branch {{ $.Values.global.targetRevision }} --depth 1 -- "${URL}" /git/repo;
112+
git clone --recurse-submodules --single-branch --branch {{ $.Values.global.targetRevision }} --depth 1 -- "${URL}" /git/repo;
113113
chmod 0770 /git/{repo,home};
114114
{{- end }}
115115
{{/* Final done container */}}

‎tests/clustergroup-industrial-edge-factory.expected.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ spec:
408408
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
409409
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
410410
mkdir /git/{repo,home};
411-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
411+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
412412
chmod 0770 /git/{repo,home};
413413
- name: test
414414
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest

‎tests/clustergroup-industrial-edge-hub.expected.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ spec:
569569
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
570570
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
571571
mkdir /git/{repo,home};
572-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
572+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
573573
chmod 0770 /git/{repo,home};
574574
- name: test
575575
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest
@@ -668,7 +668,7 @@ spec:
668668
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
669669
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
670670
mkdir /git/{repo,home};
671-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
671+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
672672
chmod 0770 /git/{repo,home};
673673
- name: unseal-playbook
674674
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest

‎tests/clustergroup-medical-diagnosis-hub.expected.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ spec:
496496
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
497497
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
498498
mkdir /git/{repo,home};
499-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
499+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
500500
chmod 0770 /git/{repo,home};
501501
- name: test
502502
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest
@@ -595,7 +595,7 @@ spec:
595595
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
596596
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
597597
mkdir /git/{repo,home};
598-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
598+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
599599
chmod 0770 /git/{repo,home};
600600
- name: unseal-playbook
601601
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest

‎tests/clustergroup-naked.expected.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ spec:
261261
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
262262
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
263263
mkdir /git/{repo,home};
264-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
264+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
265265
chmod 0770 /git/{repo,home};
266266
- name: unseal-playbook
267267
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest

‎tests/clustergroup-normal.expected.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ spec:
458458
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
459459
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
460460
mkdir /git/{repo,home};
461-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
461+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
462462
chmod 0770 /git/{repo,home};
463463
- name: test
464464
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest
@@ -557,7 +557,7 @@ spec:
557557
OUT="$(oc get proxy.config.openshift.io/cluster -o jsonpath='{.spec.noProxy}' 2>/dev/null)";
558558
if [ -n "${OUT}" ]; then export NO_PROXY="${OUT}"; fi;
559559
mkdir /git/{repo,home};
560-
git clone --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
560+
git clone --recurse-submodules --single-branch --branch main --depth 1 -- "${URL}" /git/repo;
561561
chmod 0770 /git/{repo,home};
562562
- name: unseal-playbook
563563
image: registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel9:latest

0 commit comments

Comments
 (0)