File tree Expand file tree Collapse file tree 14 files changed +26
-14
lines changed
build/ansible/group_vars/all Expand file tree Collapse file tree 14 files changed +26
-14
lines changed Original file line number Diff line number Diff line change @@ -629,7 +629,7 @@ else \
629
629
pg_isready --version; \
630
630
fi \
631
631
\
632
- && if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
632
+ && if echo '5.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
633
633
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
634
634
mongofiles --version; \
635
635
fi \
Original file line number Diff line number Diff line change @@ -691,7 +691,7 @@ else \
691
691
pg_isready --version; \
692
692
fi \
693
693
\
694
- && if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
694
+ && if echo '5.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
695
695
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
696
696
mongofiles --version; \
697
697
fi \
Original file line number Diff line number Diff line change @@ -729,7 +729,7 @@ else \
729
729
pg_isready --version; \
730
730
fi \
731
731
\
732
- && if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
732
+ && if echo '5.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
733
733
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
734
734
mongofiles --version; \
735
735
fi \
Original file line number Diff line number Diff line change @@ -743,7 +743,7 @@ else \
743
743
pg_isready --version; \
744
744
fi \
745
745
\
746
- && if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
746
+ && if echo '5.5' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
747
747
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
748
748
mongofiles --version; \
749
749
fi \
Original file line number Diff line number Diff line change 207
207
apt-get install -y --no-install-recommends --no-install-suggests \
208
208
mongodb-clients \
209
209
mongo-tools; \
210
+ else \
211
+ apt-get install -y --no-install-recommends --no-install-suggests \
212
+ mongodb-clients; \
210
213
fi \
211
214
\
212
215
&& rm -rf /var/lib/apt/lists/* \
@@ -757,7 +760,7 @@ else \
757
760
pg_isready --version; \
758
761
fi \
759
762
\
760
- && if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
763
+ && if echo '5.6' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
761
764
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
762
765
mongofiles --version; \
763
766
fi \
Original file line number Diff line number Diff line change 207
207
apt-get install -y --no-install-recommends --no-install-suggests \
208
208
mongodb-clients \
209
209
mongo-tools; \
210
+ else \
211
+ apt-get install -y --no-install-recommends --no-install-suggests \
212
+ mongodb-clients; \
210
213
fi \
211
214
\
212
215
&& rm -rf /var/lib/apt/lists/* \
@@ -738,7 +741,7 @@ else \
738
741
pg_isready --version; \
739
742
fi \
740
743
\
741
- && if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
744
+ && if echo '7.0' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
742
745
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
743
746
mongofiles --version; \
744
747
fi \
Original file line number Diff line number Diff line change @@ -734,7 +734,7 @@ else \
734
734
pg_isready --version; \
735
735
fi \
736
736
\
737
- && if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
737
+ && if echo '7.1' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
738
738
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
739
739
mongofiles --version; \
740
740
fi \
Original file line number Diff line number Diff line change @@ -754,7 +754,7 @@ else \
754
754
pg_isready --version; \
755
755
fi \
756
756
\
757
- && if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
757
+ && if echo '7.2' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
758
758
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
759
759
mongofiles --version; \
760
760
fi \
Original file line number Diff line number Diff line change @@ -755,7 +755,7 @@ else \
755
755
pg_isready --version; \
756
756
fi \
757
757
\
758
- && if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
758
+ && if echo '7.3' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
759
759
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
760
760
mongofiles --version; \
761
761
fi \
Original file line number Diff line number Diff line change @@ -755,7 +755,7 @@ else \
755
755
pg_isready --version; \
756
756
fi \
757
757
\
758
- && if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5)$' >/dev/null; then \
758
+ && if echo '7.4' | grep -E '^(5.2|5.3|5.4|5.5|5.6|7.0 )$' >/dev/null; then \
759
759
if [ "$(dpkg-architecture --query DEB_BUILD_ARCH)" = "amd64" ]; then \
760
760
mongofiles --version; \
761
761
fi \
You can’t perform that action at this time.
0 commit comments