From 9dcfcb92ff5793583b6915793c777b5f347da4ec Mon Sep 17 00:00:00 2001
From: Nils Dijk <nils@citusdata.com>
Date: Fri, 12 Jul 2024 10:26:38 +0200
Subject: [PATCH] CI: move to github container registry (#7652)

We move the CI images to the github container registry.

Given we mostly (if not solely) run these containers on github actions
infra it makes sense to have them hosted closer to where they are
needed.

Image changes: https://github.com/citusdata/the-process/pull/157

(cherry picked from commit e776a7ebbb25e8827280b3a4708ea1116419953e)
---
 .github/workflows/build_and_test.yml | 25 +++++++++++++------------
 src/test/regress/Pipfile             |  2 +-
 src/test/regress/Pipfile.lock        |  8 +++++---
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 840814f7f..672a073f9 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -19,18 +19,19 @@ jobs:
     runs-on: ubuntu-latest
     name: Initialize parameters
     outputs:
-      build_image_name: "citus/extbuilder"
-      test_image_name: "citus/exttester"
-      citusupgrade_image_name: "citus/citusupgradetester"
-      fail_test_image_name: "citus/failtester"
-      pgupgrade_image_name: "citus/pgupgradetester"
-      style_checker_image_name: "citus/stylechecker"
+      build_image_name: "ghcr.io/citusdata/extbuilder"
+      test_image_name: "ghcr.io/citusdata/exttester"
+      citusupgrade_image_name: "ghcr.io/citusdata/citusupgradetester"
+      fail_test_image_name: "ghcr.io/citusdata/failtester"
+      pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester"
+      style_checker_image_name: "ghcr.io/citusdata/stylechecker"
       style_checker_tools_version: "0.8.18"
-      image_suffix: "-v9d71045"
-      pg14_version: '{ "major": "14", "full": "14.9" }'
-      pg15_version: '{ "major": "15", "full": "15.4" }'
-      pg16_version: '{ "major": "16", "full": "16.0" }'
-      upgrade_pg_versions: "14.9-15.4-16.0"
+      sql_snapshot_pg_version: "16.2"
+      image_suffix: "-v7693016"
+      pg14_version: '{ "major": "14", "full": "14.11" }'
+      pg15_version: '{ "major": "15", "full": "15.6" }'
+      pg16_version: '{ "major": "16", "full": "16.2" }'
+      upgrade_pg_versions: "14.11-15.6-16.2"
     steps:
       # Since GHA jobs needs at least one step we use a noop step here.
       - name: Set up parameters
@@ -39,7 +40,7 @@ jobs:
     needs: params
     runs-on: ubuntu-20.04
     container:
-      image: ${{ needs.params.outputs.build_image_name }}:latest
+      image: ${{ needs.params.outputs.build_image_name }}:${{ needs.params.outputs.sql_snapshot_pg_version }}${{ needs.params.outputs.image_suffix }}
       options: --user root
     steps:
     - uses: actions/checkout@v3.5.0
diff --git a/src/test/regress/Pipfile b/src/test/regress/Pipfile
index 5bce63004..097ab1517 100644
--- a/src/test/regress/Pipfile
+++ b/src/test/regress/Pipfile
@@ -5,7 +5,7 @@ verify_ssl = true
 
 [packages]
 mitmproxy = {editable = true, ref = "main", git = "https://github.com/citusdata/mitmproxy.git"}
-construct = "==2.9.45"
+construct = "*"
 docopt = "==0.6.2"
 cryptography = ">=39.0.1"
 pytest = "*"
diff --git a/src/test/regress/Pipfile.lock b/src/test/regress/Pipfile.lock
index e6717e5fc..1b87dba5e 100644
--- a/src/test/regress/Pipfile.lock
+++ b/src/test/regress/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "9568b1f3e4d4fd408e5e263f6346b0a4f479ac88e02f64bb79a9d482096e6a03"
+            "sha256": "f8db86383082539f626f1402e720f5f2e3f9718b44a8f26110cf9f52e7ca46bc"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -201,10 +201,12 @@
         },
         "construct": {
             "hashes": [
-                "sha256:2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c"
+                "sha256:4d2472f9684731e58cc9c56c463be63baa1447d674e0d66aeb5627b22f512c29",
+                "sha256:c80be81ef595a1a821ec69dc16099550ed22197615f4320b57cc9ce2a672cb30"
             ],
             "index": "pypi",
-            "version": "==2.9.45"
+            "markers": "python_version >= '3.6'",
+            "version": "==2.10.70"
         },
         "cryptography": {
             "hashes": [