TEST with Leap 15.5 Marina's containers

Signed-off-by: Jordi Massaguer Pla <jmassaguerpla@suse.com>
uyuni-project · Aug 9, 2023 · 75417e5 · 75417e5
1 parent 8b111f4
commit 75417e5
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 14 deletions.
diff --git a/client/rhel/spacewalk-client-tools/Makefile.python b/client/rhel/spacewalk-client-tools/Makefile.python
@@ -3,7 +3,7 @@ CURRENT_DIR := $(dir $(THIS_MAKEFILE))
 include $(CURRENT_DIR)../../../rel-eng/Makefile.python
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=$PYTHONPATH"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../../../:/manager"

diff --git a/client/tools/mgr-cfg/Makefile.python b/client/tools/mgr-cfg/Makefile.python
@@ -3,7 +3,7 @@ CURRENT_DIR := $(dir $(THIS_MAKEFILE))
 include $(CURRENT_DIR)../../../rel-eng/Makefile.python
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=$PYTHONPATH"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../../../:/manager"

diff --git a/client/tools/mgr-push/Makefile.python b/client/tools/mgr-push/Makefile.python
@@ -3,7 +3,7 @@ CURRENT_DIR := $(dir $(THIS_MAKEFILE))
 include $(CURRENT_DIR)../../../rel-eng/Makefile.python
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=$PYTHONPATH"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../../../:/manager"

diff --git a/java/Makefile.docker b/java/Makefile.docker
@@ -2,7 +2,7 @@
 #
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_VOLUMES        = -v "$(CURDIR)/../:/manager"
 DOCKER_PG_PORTS       = -p 5432:5432

diff --git a/python/rhn/Makefile.python b/python/rhn/Makefile.python
@@ -3,7 +3,7 @@ CURRENT_DIR := $(dir $(THIS_MAKEFILE))
 include $(CURRENT_DIR)../../rel-eng/Makefile.python
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=$PYTHONPATH"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../../:/manager"

diff --git a/python/spacewalk/Makefile.backend b/python/spacewalk/Makefile.backend
@@ -10,7 +10,7 @@ CONF_DIRS = apache-conf rhn-conf logrotate
 EXTRA_DIRS = /var/log/rhn /var/log/rhn/reposync /var/cache/rhn /var/cache/rhn/satsync /var/log/rhn/cdnsync
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=/manager/client/rhel/rhnlib/:/manager/client/rhel/rhn-client-tools/src"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../../:/manager"

diff --git a/python/spacewalk/Makefile.python b/python/spacewalk/Makefile.python
@@ -3,7 +3,7 @@ CURRENT_DIR := $(dir $(THIS_MAKEFILE))
 include $(CURRENT_DIR)/../../rel-eng/Makefile.python
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=$PYTHONPATH"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../..:/manager"

diff --git a/susemanager-utils/susemanager-sls/Makefile.python b/susemanager-utils/susemanager-sls/Makefile.python
@@ -3,7 +3,7 @@ CURRENT_DIR := $(dir $(THIS_MAKEFILE))
 include $(CURRENT_DIR)../../rel-eng/Makefile.python
 
 # Docker tests variables
-DOCKER_CONTAINER_BASE = systemsmanagement/uyuni/master/docker/containers/uyuni-master
+DOCKER_CONTAINER_BASE = home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master
 DOCKER_REGISTRY       = registry.opensuse.org
 DOCKER_RUN_EXPORT     = "PYTHONPATH=$PYTHONPATH"
 DOCKER_VOLUMES        = -v "$(CURDIR)/../../:/manager"

diff --git a/susemanager-utils/testing/automation/VERSION.Uyuni b/susemanager-utils/testing/automation/VERSION.Uyuni
@@ -1,10 +1,10 @@
 REGISTRY=registry.opensuse.org
 VER=master
-BASE_CONTAINER=systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-base
-PGSQL_CONTAINER=systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-pgsql
-NODEJS_CONTAINER=systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-nodejs
-PUSH2OBS_CONTAINER=systemsmanagement/uyuni/master/docker/containers/uyuni-push-to-obs
-REPORTDB_DOC_CONTAINER=systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-reportdb-docs
+BASE_CONTAINER=home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-base
+PGSQL_CONTAINER=home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-pgsql
+NODEJS_CONTAINER=home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-nodejs
+PUSH2OBS_CONTAINER=home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-push-to-obs
+REPORTDB_DOC_CONTAINER=home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-$VER-reportdb-docs
 # Base version for the idempotency test. All PostgreSQL since this version must be idempotent for the test to pass
 # This value is is used if the file for the PR is not found (we assume we are on a branch)
 IDEMPOTENCY_SCHEMA_BASE_VERSION='4.2.2'

diff --git a/susemanager-utils/testing/docker/scripts/Makefile b/susemanager-utils/testing/docker/scripts/Makefile
@@ -3,7 +3,7 @@
 ifeq ($(PRODUCT), SUSE-Manager)
 DOCKER_CONTAINER = registry.suse.de/devel/galaxy/manager/head/docker/containers/suma-head-cobbler
 else
-DOCKER_CONTAINER = registry.opensuse.org/systemsmanagement/uyuni/master/docker/containers/uyuni-master-cobbler
+DOCKER_CONTAINER = registry.opensuse.org/home/deneb_alpha/branches/systemsmanagement/uyuni/master/docker/containers/uyuni-master-cobbler
 endif
 
 all :: cobbler_tests