From 26eae2e6e971afbe4218c430e26a5d371dc4f559 Mon Sep 17 00:00:00 2001
From: Hans Van Akelyen <hans.van.akelyen@gmail.com>
Date: Fri, 26 Apr 2024 12:21:29 +0200
Subject: [PATCH] failing test and test environment, fixes #3869

---
 docker/integration-tests/Dockerfile.unit-tests                | 2 +-
 integration-tests/scripts/run-tests-docker.sh                 | 4 ++--
 .../tech/avro/src/main/samples/transforms/avro-file-input.hpl | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/integration-tests/Dockerfile.unit-tests b/docker/integration-tests/Dockerfile.unit-tests
index a717a07a921..8820545133a 100644
--- 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
index 8738dc2bb9f..a0b448b9f70 100755
--- a/integration-tests/scripts/run-tests-docker.sh
+++ b/integration-tests/scripts/run-tests-docker.sh
@@ -48,7 +48,7 @@ if [ -z "${JENKINS_USER}" ]; then
 fi
 
 if [ -z "${JENKINS_UID}" ]; then
-  JENKINS_UID="1000"
+  JENKINS_UID="1001"
 fi
 
 if [ -z "${JENKINS_GROUP}" ]; then
@@ -56,7 +56,7 @@ if [ -z "${JENKINS_GROUP}" ]; then
 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
index f46d0fd8489..8c3bf8c77ef 100644
--- 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>