Use internal conjur edge image in integration tests, update postgres container

Author: gl-johnson

Jenkinsfile

@@ -137,6 +137,9 @@ pipeline {
     }
 
     stage('Integration tests') {
+      environment {
+        INFRAPOOL_REGISTRY_URL = "registry.tld"
+      }
       steps {
         script {
           grantIPAccess(infrapool)

ci/test/conjur-deployment/ubuntu_compose.yml

@@ -24,12 +24,12 @@ services:
       - ${PWD}/ci/test/conjur-deployment/configuration/https/:/tmp/conf
 
   pg:
-    image: postgres:9.4
+    image: postgres:15
     environment:
       POSTGRES_HOST_AUTH_METHOD: trust
 
   conjur:
-    image: cyberark/conjur:latest
+    image: ${REGISTRY_URL:-docker.io}/cyberark/conjur:edge
     command: server -a dev -f /policy/initial_policy.yml
     environment:
       CONJUR_DATA_KEY: 'OyXV68Mip14xj33huGaQKewmmS+gKtDlp6ECZ2iATpU='

ci/test/test_integration

@@ -34,6 +34,8 @@ function get_parameters() {
 get_parameters $@
 cleanup
 
+export REGISTRY_URL=${INFRAPOOL_REGISTRY_URL:-"docker.io"}
+
 echo "Building API container..."
 docker_compose_command build test