@@ -1218,12 +1218,6 @@ jobs:
12181218
12191219 - name : Set up Docker Buildx
12201220 uses : docker/setup-buildx-action@v3
1221-
1222- - name : Setup Python
1223- 1224- with :
1225- cache : pip
1226- python-version : ' 3.11'
12271221
12281222 - name : Git Ref Parse
12291223 id : git_ref_parse
@@ -1302,25 +1296,6 @@ jobs:
13021296 echo "UID=${UID}"
13031297 echo "GID=${GID}"
13041298 } >> "${GITHUB_ENV}"
1305-
1306- - name : Install psql
1307- if : env.BUILD_IMAGE_REQUIRED == 'true'
1308- run : |
1309- sudo apt-get update
1310- sudo apt-get install --yes --no-install-recommends \
1311- postgresql-client \
1312- ca-certificates \
1313- openssl
1314-
1315- # for some reason skipping this with env.BUILD_IMAGE_REQUIRED == 'true' breaks python cleanup where it can't find pip cache
1316- - name : Install Python dependencies
1317- run : |
1318- pip3 install -r cicd/requirements.txt
1319-
1320- - name : Generate rewritten registry for simulations
1321- if : env.BUILD_IMAGE_REQUIRED == 'true'
1322- run : |
1323- python3 test/python/registry-rewrite.py --replacement-host=host.docker.internal
13241299
13251300 - name : Pull Docker base images for cache purposes
13261301 if : env.BUILD_IMAGE_REQUIRED == 'true'
@@ -1333,16 +1308,6 @@ jobs:
13331308 run : |
13341309 docker pull --platform ${{ matrix.platform }} stackql/stackql:latest || echo 'could not pull image for cache purposes'
13351310
1336- - name : Create certificates for robot tests
1337- if : env.BUILD_IMAGE_REQUIRED == 'true'
1338- run : |
1339- openssl req -x509 -keyout test/server/mtls/credentials/pg_server_key.pem -out test/server/mtls/credentials/pg_server_cert.pem -config test/server/mtls/openssl.cnf -days 365
1340- openssl req -x509 -keyout test/server/mtls/credentials/pg_client_key.pem -out test/server/mtls/credentials/pg_client_cert.pem -config test/server/mtls/openssl.cnf -days 365
1341- openssl req -x509 -keyout test/server/mtls/credentials/pg_rubbish_key.pem -out test/server/mtls/credentials/pg_rubbish_cert.pem -config test/server/mtls/openssl.cnf -days 365
1342- openssl req -x509 -keyout cicd/vol/srv/credentials/pg_server_key.pem -out cicd/vol/srv/credentials/pg_server_cert.pem -config test/server/mtls/openssl.cnf -days 365
1343- openssl req -x509 -keyout cicd/vol/srv/credentials/pg_client_key.pem -out cicd/vol/srv/credentials/pg_client_cert.pem -config test/server/mtls/openssl.cnf -days 365
1344- openssl req -x509 -keyout cicd/vol/srv/credentials/pg_rubbish_key.pem -out cicd/vol/srv/credentials/pg_rubbish_cert.pem -config test/server/mtls/openssl.cnf -days 365
1345-
13461311 - name : Build image precursors
13471312 if : env.BUILD_IMAGE_REQUIRED == 'true'
13481313 run : |
@@ -1490,6 +1455,42 @@ jobs:
14901455 echo "### ###"
14911456 echo ""
14921457
1458+ - name : Install psql
1459+ if : env.BUILD_IMAGE_REQUIRED == 'true'
1460+ run : |
1461+ sudo apt-get update
1462+ sudo apt-get install --yes --no-install-recommends \
1463+ postgresql-client \
1464+ ca-certificates \
1465+ openssl
1466+
1467+ - name : Setup Python
1468+ 1469+ with :
1470+ cache : pip
1471+ python-version : ' 3.11'
1472+
1473+ # for some reason skipping this with env.BUILD_IMAGE_REQUIRED == 'true' breaks python cleanup where it can't find pip cache
1474+ - name : Install Python dependencies
1475+ run : |
1476+ pip3 install -r cicd/requirements.txt
1477+
1478+ - name : Generate rewritten registry for simulations
1479+ if : env.BUILD_IMAGE_REQUIRED == 'true'
1480+ run : |
1481+ python3 test/python/registry-rewrite.py --replacement-host=host.docker.internal
1482+
1483+
1484+ - name : Create certificates for robot tests
1485+ if : env.BUILD_IMAGE_REQUIRED == 'true'
1486+ run : |
1487+ openssl req -x509 -keyout test/server/mtls/credentials/pg_server_key.pem -out test/server/mtls/credentials/pg_server_cert.pem -config test/server/mtls/openssl.cnf -days 365
1488+ openssl req -x509 -keyout test/server/mtls/credentials/pg_client_key.pem -out test/server/mtls/credentials/pg_client_cert.pem -config test/server/mtls/openssl.cnf -days 365
1489+ openssl req -x509 -keyout test/server/mtls/credentials/pg_rubbish_key.pem -out test/server/mtls/credentials/pg_rubbish_cert.pem -config test/server/mtls/openssl.cnf -days 365
1490+ openssl req -x509 -keyout cicd/vol/srv/credentials/pg_server_key.pem -out cicd/vol/srv/credentials/pg_server_cert.pem -config test/server/mtls/openssl.cnf -days 365
1491+ openssl req -x509 -keyout cicd/vol/srv/credentials/pg_client_key.pem -out cicd/vol/srv/credentials/pg_client_cert.pem -config test/server/mtls/openssl.cnf -days 365
1492+ openssl req -x509 -keyout cicd/vol/srv/credentials/pg_rubbish_key.pem -out cicd/vol/srv/credentials/pg_rubbish_cert.pem -config test/server/mtls/openssl.cnf -days 365
1493+
14931494 - name : Run robot mocked functional tests
14941495 if : success() && env.CI_IS_EXPRESS != 'true' && matrix.platform == 'linux/amd64' && env.BUILD_IMAGE_REQUIRED == 'true' && matrix.db_backend == 'sqlite'
14951496 timeout-minutes : ${{ vars.DEFAULT_STEP_TIMEOUT_MIN == '' && 20 || vars.DEFAULT_STEP_TIMEOUT_MIN }}
0 commit comments