Skip to content

Commit 920f502

Browse files
authored
chore: remove barman-cloud (#87)
--------- Signed-off-by: Niccolò Fei <[email protected]>
1 parent 4d279b9 commit 920f502

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

.github/workflows/build-commitfest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
commitFestURL="https://commitfest.postgresql.org/patch/${commitFestPatchID}"
101101
images="${{ needs.build-pg.outputs.images }}"
102102
images_list="$(echo $images | tr ' ' '\n' | sed 's/^/https:\/\//')"
103-
standardImage="$(echo $images | tr ' ' '\n' | grep standard)"
103+
minimalImage="$(echo $images | tr ' ' '\n' | grep minimal)"
104104
105105
echo "# Commitfest Image Build summary" >> $GITHUB_STEP_SUMMARY
106106
echo "**Commitfest Patch URL**: [$commitFestPatchID]($commitFestURL)" >> $GITHUB_STEP_SUMMARY
@@ -116,7 +116,7 @@ jobs:
116116
echo "metadata:" >> $GITHUB_STEP_SUMMARY
117117
echo " name: commitfest-$commitFestPatchID" >> $GITHUB_STEP_SUMMARY
118118
echo "spec:" >> $GITHUB_STEP_SUMMARY
119-
echo " imageName: $standardImage" >> $GITHUB_STEP_SUMMARY
119+
echo " imageName: $minimalImage" >> $GITHUB_STEP_SUMMARY
120120
echo " instances: 3" >> $GITHUB_STEP_SUMMARY
121121
echo " storage:" >> $GITHUB_STEP_SUMMARY
122122
echo " size: 1Gi" >> $GITHUB_STEP_SUMMARY

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ jobs:
9898
pg_major="${{ needs.build-pg.outputs.pg_major }}"
9999
images="${{ needs.build-pg.outputs.images }}"
100100
images_list="$(echo $images | tr ' ' '\n' | sed 's/^/https:\/\//')"
101-
standardImage="$(echo $images | tr ' ' '\n' | grep standard)"
101+
minimalImage="$(echo $images | tr ' ' '\n' | grep minimal)"
102102
103103
echo "# PostgreSQL Image Build summary" >> $GITHUB_STEP_SUMMARY
104104
echo "Here's the list of Container Images that have been built:" >> $GITHUB_STEP_SUMMARY
105105
echo "$images_list" >> $GITHUB_STEP_SUMMARY
106106
107-
echo "## CloudNativePG Cluster definition (example using the standard image)" >> $GITHUB_STEP_SUMMARY
107+
echo "## CloudNativePG Cluster definition (example using the minimal image)" >> $GITHUB_STEP_SUMMARY
108108
echo "You can create a cluster in CloudNativePG running this image:" >> $GITHUB_STEP_SUMMARY
109109
echo "\`\`\`sh" >> $GITHUB_STEP_SUMMARY
110110
echo "(cat <<EOF" >> $GITHUB_STEP_SUMMARY
@@ -113,7 +113,7 @@ jobs:
113113
echo "metadata:" >> $GITHUB_STEP_SUMMARY
114114
echo " name: pg-$pg_major-build" >> $GITHUB_STEP_SUMMARY
115115
echo "spec:" >> $GITHUB_STEP_SUMMARY
116-
echo " imageName: $standardImage" >> $GITHUB_STEP_SUMMARY
116+
echo " imageName: $minimalImage" >> $GITHUB_STEP_SUMMARY
117117
echo " instances: 3" >> $GITHUB_STEP_SUMMARY
118118
echo " storage:" >> $GITHUB_STEP_SUMMARY
119119
echo " size: 1Gi" >> $GITHUB_STEP_SUMMARY

.github/workflows/continuous-delivery.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
- name: Generated images
8383
id: images
8484
run: |
85-
echo "PG_IMAGE=$(echo '${{ steps.build.outputs.metadata }}' | jq -r '.["standard"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV
85+
echo "PG_IMAGE=$(echo '${{ steps.build.outputs.metadata }}' | jq -r '.["minimal"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV
8686
8787
call-reusable-e2e:
8888
if: github.event_name == 'schedule'

.github/workflows/reusable-e2e.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,18 @@ jobs:
146146
docker push $E2E_PRE_ROLLING_UPDATE_IMG
147147
echo "E2E_PRE_ROLLING_UPDATE_IMG=$E2E_PRE_ROLLING_UPDATE_IMG" >> $GITHUB_ENV
148148
149-
- name: Setting up default versions
149+
- name: Setting up defaults
150150
run: |
151151
# Update pkg/versions/versions.go
152152
sed -i '/DefaultImageName *=/s@".*"@"'"${{ inputs.postgres_img }}"'"@' pkg/versions/versions.go
153153
154+
# Exlude backup/recovery tests
155+
if [ -z "${{ env.FEATURE_TYPE }}" ]; then
156+
echo "FEATURE_TYPE=!backup-restore" >> $GITHUB_ENV
157+
else
158+
echo "FEATURE_TYPE=${{ env.FEATURE_TYPE }},!backup-restore" >> $GITHUB_ENV
159+
fi
160+
154161
- name: Run Kind End-to-End tests
155162
run: make e2e-test-kind
156163

Dockerfile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ RUN apt-get update && \
3333
gnupg \
3434
dirmngr \
3535
ca-certificates \
36-
locales-all \
3736
ssl-cert \
3837
libnss-wrapper \
3938
libgssapi-krb5-2 \
@@ -127,16 +126,9 @@ FROM build-layer AS standard
127126
# make install USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/$PG_MAJOR/bin/pg_config && \
128127
# rm -rf /usr/src/pgaudit
129128

130-
# Install barman-cloud
129+
# Install all locales
131130
RUN apt-get update && \
132-
/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
133-
apt-get install -y --no-install-recommends \
134-
python3-pip \
135-
python3-psycopg2 \
136-
python3-setuptools \
137-
&& \
138-
pip3 install --break-system-packages --upgrade pip && \
139-
pip3 install --break-system-packages barman[cloud,azure,google,snappy,zstandard,lz4]==3.13.2
131+
apt-get install -y --no-install-recommends locales-all
140132

141133
RUN apt-get purge -y --auto-remove $(cat /build-deps.txt) && \
142134
rm -rf /var/lib/apt/lists/* /var/cache/* /var/log/*

defaults.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"PG_IMAGE": "ghcr.io/cloudnative-pg/postgresql-trunk:18-standard-bookworm",
2+
"PG_IMAGE": "ghcr.io/cloudnative-pg/postgresql-trunk:18-minimal-bookworm",
33
"PG_MAJOR": 18,
44
"CNPG_BRANCH": "main",
55
"TEST_DEPTH": 4,

0 commit comments

Comments
 (0)