File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5353 POSTGRES_IMG : ${{ inputs.postgres_img }}
5454 POSTGRES_KIND : " PostgreSQL"
5555 POSTGRES_MAJOR_UPGRADE_IMAGE_REGISTRY : " ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
56- POSTGIS_MAJOR_UPGRADE_IMAGE_REGISTRY : " ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
5756
5857 DOCKER_SERVER : ghcr.io
5958 DOCKER_USERNAME : ${{ github.actor }}
@@ -135,11 +134,11 @@ jobs:
135134
136135 - name : Setting up defaults
137136 run : |
138- # Exlude backup/recovery tests
137+ # Exlude backup/recovery and image-volume tests
139138 if [ -z "${{ env.FEATURE_TYPE }}" ]; then
140- echo "FEATURE_TYPE=!backup-restore" >> $GITHUB_ENV
139+ echo "FEATURE_TYPE=!( backup-restore || image-volume-extensions) " >> $GITHUB_ENV
141140 else
142- echo "FEATURE_TYPE=${{ env.FEATURE_TYPE }},!backup-restore " >> $GITHUB_ENV
141+ echo "FEATURE_TYPE=!(backup-restore || image-volume-extensions) && ${{ env.FEATURE_TYPE }}" >> $GITHUB_ENV
143142 fi
144143
145144 - name : Run Kind End-to-End tests
Original file line number Diff line number Diff line change @@ -116,29 +116,6 @@ USER 26
116116FROM minimal AS standard
117117USER root
118118
119- # Build PgAudit
120- # See to https://github.com/pgaudit/pgaudit/blob/master/README.md#compile-and-install
121- # TODO: uncomment when https://github.com/pgaudit/pgaudit/issues/257 is fixed
122- # RUN apt-get update && \
123- # apt-get install -y --no-install-recommends \
124- # build-essential \
125- # git \
126- # libssl-dev \
127- # libkrb5-dev \
128- # && \
129- # mkdir -p /usr/src/pgaudit && \
130- # git clone -b main --single-branch https://github.com/pgaudit/pgaudit.git /usr/src/pgaudit && \
131- # cd /usr/src/pgaudit && \
132- # make install USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/$PG_MAJOR/bin/pg_config && \
133- # apt-get purge -y --auto-remove \
134- # build-essential \
135- # git \
136- # libssl-dev \
137- # libkrb5-dev \
138- # && \
139- # apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
140- # rm -rf /var/lib/apt/lists/* /var/cache/* /var/log/* /usr/src/pgaudit
141-
142119# Install all locales
143120RUN apt-get update && \
144121 apt-get install -y --no-install-recommends locales-all && \
You can’t perform that action at this time.
0 commit comments