Add so files from the specified version to the test image

Author: eaydingol

circleci/images/Makefile

@@ -28,6 +28,9 @@ CITUS_UPGRADE_VERSIONS_17=v13.2.0
 # Function to get Citus versions for a specific PG major version
 get_citus_versions = $(CITUS_UPGRADE_VERSIONS_$(1))
 
+# Function to get the last Citus version for a specific PG major version
+get_last_citus_version = $(lastword $(CITUS_UPGRADE_VERSIONS_$(1)))
+
 # code below creates targets for all postgres versions in PG_VERSIONS
 define make-image-targets
 # $1 = PG_VERSION
@@ -54,12 +57,12 @@ push-all:: push-extbuilder-$1
 push-extbuilder-all:: push-extbuilder-$1
 
 build-exttester-$1:
-	docker build \
-		exttester/ \
+	docker build . \
 		-f exttester/Dockerfile \
 		--build-arg=PG_VERSION=$1 \
 		--build-arg=PG_MAJOR=$2 \
 		--build-arg=PG_VERSION_CLEAN=$3 \
+		--build-arg=CITUS_VERSION="$(call get_last_citus_version,$2)" \
 		--tag=${DOCKER_REPO}/exttester:$3${TAG_SUFFIX}
 
 build-all:: build-exttester-$1

circleci/images/citusupgradetester/files/sbin/build-citus

@@ -50,7 +50,8 @@ build_ext() {
 
   cd "${installdir}" && find . -type f -print > "${builddir}/files.lst"
   tar cvf "${basedir}/install-pg${pg_major}-citus${citus_version}.tar" `cat ${builddir}/files.lst`
-
+  find usr/lib/postgresql/${pg_major}/lib -type f -name '*.so' -printf '%P\n' > "${builddir}/so-files.lst"
+  tar cvf "${basedir}/so-pg${pg_major}-citus${citus_version}.tar" -C usr/lib/postgresql/${pg_major}/lib -T "${builddir}/so-files.lst"
   cd "${builddir}" && rm -rf install files.lst && make clean
 }
 for citus_version in ${CITUS_VERSIONS}

circleci/images/exttester/Dockerfile

@@ -84,6 +84,96 @@ COPY --from=dev-tools-builder /build/postgresql-${PG_VERSION_CLEAN}/build/src/te
 COPY --from=dev-tools-builder /build/postgresql-${PG_VERSION_CLEAN}/src/test/regress/ usr/lib/postgresql/${PG_MAJOR}/lib/regress/
 RUN rm -rf usr/lib/postgresql/${PG_MAJOR}/lib/regress/*.c usr/lib/postgresql/${PG_MAJOR}/lib/regress/*.h
 
+FROM buildpack-deps:bullseye AS build-citus
+
+# add unpriviliged user for tests
+RUN useradd -ms /bin/bash circleci
+
+RUN <<'EOF'
+# install dependencies
+set -eux
+apt-get update
+
+apt-get install -y --no-install-recommends \
+    apt-transport-https \
+    autoconf \
+    build-essential \
+    ca-certificates \
+    curl \
+    debian-archive-keyring \
+    gcc \
+    gnupg \
+    gosu \
+    libcurl4 \
+    libcurl4-openssl-dev \
+    libicu-dev \
+    liblz4-1 \
+    liblz4-dev \
+    libreadline-dev \
+    libselinux1-dev \
+    libssl-dev \
+    libxslt-dev \
+    libzstd-dev \
+    libzstd1 \
+    locales \
+    make \
+    perl \
+
+# clear apt cache
+rm -rf /var/lib/apt/lists/*
+EOF
+
+ARG PG_VERSION
+ARG PG_MAJOR
+ENV PG_VERSION=$PG_VERSION
+ENV PG_MAJOR=$PG_MAJOR
+
+RUN <<'EOF'
+# install postgres ecosystem for pg version: $PG_VERSION
+set -eux
+
+# install key and repositories
+curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
+echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
+echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
+
+apt-get update
+
+# infer the pgdgversion of postgres based on the $PG_VERSION
+pgdg_version=$(apt list -a postgresql-server-dev-${PG_MAJOR} 2>/dev/null | grep "${PG_VERSION}" | awk '{print $2}' | head -n1 )
+
+apt-get install -y --no-install-recommends --allow-downgrades \
+    libpq-dev=${pgdg_version} \
+    libpq5=${pgdg_version} \
+    postgresql-${PG_MAJOR}=${pgdg_version} \
+    postgresql-client-${PG_MAJOR}=${pgdg_version} \
+    postgresql-${PG_MAJOR}-dbgsym=${pgdg_version} \
+    postgresql-server-dev-${PG_MAJOR}=${pgdg_version}
+
+# clear apt cache
+rm -rf /var/lib/apt/lists/*
+EOF
+
+# add postgress to the path
+ENV PATH=/usr/lib/postgresql/$PG_MAJOR/bin/:$PATH
+
+# setup /var/run/postgresql for use with circleci
+RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgresql && chmod 2777 /var/run/postgresql
+
+
+ARG CITUS_VERSION
+ENV CITUS_VERSION=$CITUS_VERSION
+ENV CITUS_VERSIONS=$CITUS_VERSION
+
+WORKDIR /build-citus/
+COPY citusupgradetester/files/sbin/build-citus .
+RUN ./build-citus
+    
+
+USER circleci
+WORKDIR /home/circleci
+
+
 FROM buildpack-deps:bullseye
 
 # add unpriviliged user for tests
@@ -183,4 +273,14 @@ RUN mkdir -p /var/run/postgresql && chown -R postgres:postgres /var/run/postgres
 # copy the collected files from the collection container at once into the final container
 COPY --from=dev-tools-collection /collect/ /
 
+ARG CITUS_VERSION
+ENV CITUS_VERSION=$CITUS_VERSION
+
+# copy citus so files from the build-citus stage
+WORKDIR /opt/citus-versions/${CITUS_VERSION}
+COPY --from=build-citus /build-citus/so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar .
+RUN tar xvf so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar
+# cleanup build artifacts
+RUN rm so-pg${PG_MAJOR}-citus${CITUS_VERSION}.tar
+    
 WORKDIR /home/circleci