Update to CentOS7 based tests and ldap images

trinodb · Jun 28, 2021 · 4f67c90 · 4f67c90
1 parent d56a6d9
commit 4f67c90
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/...tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentDefaults.java b/...tests-launcher/src/main/java/io/trino/tests/product/launcher/env/EnvironmentDefaults.java
@@ -15,7 +15,7 @@
 
 public final class EnvironmentDefaults
 {
-    public static final String DOCKER_IMAGES_VERSION = "34";
+    public static final String DOCKER_IMAGES_VERSION = "41";
     public static final String HADOOP_BASE_IMAGE = "ghcr.io/trinodb/testing/hdp2.6-hive";
     public static final String HADOOP_IMAGES_VERSION = DOCKER_IMAGES_VERSION;
     public static final String TEMPTO_ENVIRONMENT_CONFIG = "/dev/null";

diff --git a/...uct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java b/...uct-tests-launcher/src/main/java/io/trino/tests/product/launcher/env/common/Standard.java
@@ -113,7 +113,7 @@ private DockerContainer createPrestoMaster()
     @SuppressWarnings("resource")
     private DockerContainer createTestsContainer()
     {
-        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/centos6-oj8:" + imagesVersion, TESTS)
+        DockerContainer container = new DockerContainer("ghcr.io/trinodb/testing/centos7-oj8:" + imagesVersion, TESTS)
                 .withCopyFileToContainer(forHostPath(dockerFiles.getDockerFilesHostPath()), "/docker/presto-product-tests")
                 .withCommand("bash", "-xeuc", "echo 'No command provided' >&2; exit 69")
                 .waitingFor(new WaitAllStrategy()) // don't wait

diff --git a/...src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeLdap.java b/...src/main/java/io/trino/tests/product/launcher/env/environment/AbstractSinglenodeLdap.java
@@ -90,7 +90,7 @@ public void extendEnvironment(Environment.Builder builder)
 
     protected String getBaseImage()
     {
-        return "centos6-oj8-openldap";
+        return "centos7-oj8-openldap";
     }
 
     protected abstract String getPasswordAuthenticatorConfigPath();

diff --git a/...rc/main/java/io/trino/tests/product/launcher/env/environment/SinglenodeLdapReferrals.java b/...rc/main/java/io/trino/tests/product/launcher/env/environment/SinglenodeLdapReferrals.java
@@ -42,6 +42,6 @@ protected String getPasswordAuthenticatorConfigPath()
     @Override
     protected String getBaseImage()
     {
-        return "centos6-oj8-openldap-referrals";
+        return "centos7-oj8-openldap-referrals";
     }
 }
diff --git a/...-product-tests/conf/environment/singlenode-ldap-bind-dn/password-authenticator.properties b/...-product-tests/conf/environment/singlenode-ldap-bind-dn/password-authenticator.properties
@@ -1,7 +1,7 @@
 password-authenticator.name=ldap
 ldap.url=ldaps://ldapserver:636
 ldap.ssl-trust-certificate=/etc/openldap/certs/openldap-certificate.pem
-ldap.user-base-dn=dc=presto,dc=testldap,dc=com
-ldap.bind-dn=cn=admin,dc=presto,dc=testldap,dc=com
+ldap.user-base-dn=dc=trino,dc=testldap,dc=com
+ldap.bind-dn=cn=admin,dc=trino,dc=testldap,dc=com
 ldap.bind-password=admin
-ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=presto,dc=testldap,dc=com))
+ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=trino,dc=testldap,dc=com))
diff --git a/...roduct-tests/conf/environment/singlenode-ldap-referrals/password-authenticator.properties b/...roduct-tests/conf/environment/singlenode-ldap-referrals/password-authenticator.properties
@@ -1,6 +1,6 @@
 password-authenticator.name=ldap
 ldap.url=ldaps://ldapserver:636
 ldap.ssl-trust-certificate=/etc/openldap/certs/openldap-certificate.pem
-ldap.user-bind-pattern=uid=${USER},ou=America,dc=presto,dc=testldap,dc=com:uid=${USER},ou=Asia,dc=presto,dc=testldap,dc=com
-ldap.user-base-dn=ou=World,dc=presto,dc=testldap,dc=com
-ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=presto,dc=testldap,dc=com))
+ldap.user-bind-pattern=uid=${USER},ou=America,dc=trino,dc=testldap,dc=com:uid=${USER},ou=Asia,dc=trino,dc=testldap,dc=com
+ldap.user-base-dn=ou=World,dc=trino,dc=testldap,dc=com
+ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=trino,dc=testldap,dc=com))
diff --git a/...duct-tests/conf/environment/singlenode-ldap-without-ssl/password-authenticator.properties b/...duct-tests/conf/environment/singlenode-ldap-without-ssl/password-authenticator.properties
@@ -1,6 +1,6 @@
 password-authenticator.name=ldap
 ldap.url=ldap://ldapserver:389
 ldap.allow-insecure=true
-ldap.user-bind-pattern=uid=${USER},ou=America,dc=presto,dc=testldap,dc=com:uid=${USER},ou=Asia,dc=presto,dc=testldap,dc=com
-ldap.user-base-dn=dc=presto,dc=testldap,dc=com
-ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=presto,dc=testldap,dc=com))
+ldap.user-bind-pattern=uid=${USER},ou=America,dc=trino,dc=testldap,dc=com:uid=${USER},ou=Asia,dc=trino,dc=testldap,dc=com
+ldap.user-base-dn=dc=trino,dc=testldap,dc=com
+ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=trino,dc=testldap,dc=com))
diff --git a/...r/presto-product-tests/conf/environment/singlenode-ldap/password-authenticator.properties b/...r/presto-product-tests/conf/environment/singlenode-ldap/password-authenticator.properties
@@ -1,6 +1,6 @@
 password-authenticator.name=ldap
 ldap.url=ldaps://ldapserver:636
 ldap.ssl-trust-certificate=/etc/openldap/certs/openldap-certificate.pem
-ldap.user-bind-pattern=uid=${USER},ou=America,dc=presto,dc=testldap,dc=com:uid=${USER},ou=Asia,dc=presto,dc=testldap,dc=com
-ldap.user-base-dn=dc=presto,dc=testldap,dc=com
-ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=presto,dc=testldap,dc=com))
+ldap.user-bind-pattern=uid=${USER},ou=America,dc=trino,dc=testldap,dc=com:uid=${USER},ou=Asia,dc=trino,dc=testldap,dc=com
+ldap.user-base-dn=dc=trino,dc=testldap,dc=com
+ldap.group-auth-pattern=(&(objectClass=inetOrgPerson)(uid=${USER})(memberof=cn=DefaultGroup,ou=America,dc=trino,dc=testldap,dc=com))
diff --git a/...no-product-tests/src/main/java/io/trino/tests/product/ImmutableLdapObjectDefinitions.java b/...no-product-tests/src/main/java/io/trino/tests/product/ImmutableLdapObjectDefinitions.java
@@ -25,7 +25,7 @@
 
 public final class ImmutableLdapObjectDefinitions
 {
-    private static final String DOMAIN = "dc=presto,dc=testldap,dc=com";
+    private static final String DOMAIN = "dc=trino,dc=testldap,dc=com";
     private static final String AMERICA_DISTINGUISHED_NAME = format("ou=America,%s", DOMAIN);
     private static final String ASIA_DISTINGUISHED_NAME = format("ou=Asia,%s", DOMAIN);
     private static final String EUROPE_DISTINGUISHED_NAME = format("ou=Europe,%s", DOMAIN);

diff --git a/testing/trino-product-tests/src/main/resources/tempto-configuration.yaml b/testing/trino-product-tests/src/main/resources/tempto-configuration.yaml
@@ -174,6 +174,6 @@ tests:
 
 ldap:
    admin:
-       dn: cn=admin,dc=presto,dc=testldap,dc=com
+       dn: cn=admin,dc=trino,dc=testldap,dc=com
        password: admin
    url: ldap://ldapserver