Merge pull request #3870 from hansva/main

failing test and test environment, fixes #3869
apache · Apr 26, 2024 · 76ea39c · 76ea39c
2 parents 3381c73 + 26eae2e
commit 76ea39c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docker/integration-tests/Dockerfile.unit-tests b/docker/integration-tests/Dockerfile.unit-tests
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-FROM ubuntu
+FROM ubuntu:22.04
 MAINTAINER Apache Hop
 
 # Argument Branch name, used to download correct version

diff --git a/integration-tests/scripts/run-tests-docker.sh b/integration-tests/scripts/run-tests-docker.sh
@@ -48,15 +48,15 @@ if [ -z "${JENKINS_USER}" ]; then
 fi
 
 if [ -z "${JENKINS_UID}" ]; then
-  JENKINS_UID="1000"
+  JENKINS_UID="1001"
 fi
 
 if [ -z "${JENKINS_GROUP}" ]; then
   JENKINS_GROUP="jenkins"
 fi
 
 if [ -z "${JENKINS_GID}" ]; then
-  JENKINS_GID="1000"
+  JENKINS_GID="1001"
 fi
 
 if [ -z "${SUREFIRE_REPORT}" ]; then

diff --git a/plugins/tech/avro/src/main/samples/transforms/avro-file-input.hpl b/plugins/tech/avro/src/main/samples/transforms/avro-file-input.hpl
@@ -190,7 +190,7 @@ limitations under the License.
       <field>
         <length>-1</length>
         <name>avro_file_url</name>
-        <nullif>https://github.com/apache/hop/raw/master/integration-tests/transforms/files/userdata1.avro</nullif>
+        <nullif>https://github.com/apache/hop/raw/main/integration-tests/transforms/files/userdata1.avro</nullif>
         <precision>-1</precision>
         <set_empty_string>N</set_empty_string>
         <type>String</type>