From 1724719d49b62805f5526e75072f1d6fac37eebe Mon Sep 17 00:00:00 2001 From: Jozef Pupava Date: Fri, 6 Oct 2023 10:01:41 +0200 Subject: [PATCH] Use different gw ip based on SUT location/hostname Due to s390x workers in PRG https://suse.slack.com/archives/C02CANHLANP/p1696574135714859 --- data/autoyast_qam/12-common_base_installation.xml.ep | 5 +++++ data/autoyast_qam/12_installation.xml.ep | 5 +++++ data/autoyast_qam/15-common_base_installation.xml.ep | 5 +++++ data/autoyast_qam/15_installation.xml.ep | 5 +++++ ...toyast_sles12sp3+alladdons_allpatterns_reg_full_s390x.xml | 5 +++++ .../autoyast_sles12sp3+alladdons_default_reg_full_s390x.xml | 5 +++++ ...oyast_sles12sp3+sdk+ha+geo_allpatterns_reg_full_s390x.xml | 5 +++++ .../autoyast_sles12sp3+sdk+ha+geo_default_reg_full_s390x.xml | 5 +++++ .../autoyast_sles12sp3_allpatterns_reg_full_s390x.xml | 5 +++++ .../autoyast_sles12sp3_default_reg_full_s390x.xml | 5 +++++ data/autoyast_sle12/ay.xml | 5 +++++ data/qam/dracut/12-SP2_custom_lvm.xml.ep | 5 +++++ data/qam/dracut/12-SP2_custom_usr.xml.ep | 5 +++++ data/qam/dracut/12_custom_lvm.xml.ep | 5 +++++ data/yam/autoyast/support_images/create_hdd_ha_sles.xml.ep | 5 +++++ .../support_images/create_hdd_sles_regression_aarch64.xml.ep | 5 +++++ .../support_images/create_hdd_sles_regression_s390x.xml.ep | 5 +++++ .../support_images/sles12sp5_install_all_patterns_s390x.xml | 5 +++++ .../sles12sp5_install_default_patterns_s390x.xml | 5 +++++ 19 files changed, 95 insertions(+) diff --git a/data/autoyast_qam/12-common_base_installation.xml.ep b/data/autoyast_qam/12-common_base_installation.xml.ep index 27089bdae77b..846666372898 100644 --- a/data/autoyast_qam/12-common_base_installation.xml.ep +++ b/data/autoyast_qam/12-common_base_installation.xml.ep @@ -197,7 +197,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_qam/12_installation.xml.ep b/data/autoyast_qam/12_installation.xml.ep index 53713026ccbc..a0a9a739a90a 100644 --- a/data/autoyast_qam/12_installation.xml.ep +++ b/data/autoyast_qam/12_installation.xml.ep @@ -166,7 +166,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_qam/15-common_base_installation.xml.ep b/data/autoyast_qam/15-common_base_installation.xml.ep index 1bc27b24185f..f14f1ea9b78c 100644 --- a/data/autoyast_qam/15-common_base_installation.xml.ep +++ b/data/autoyast_qam/15-common_base_installation.xml.ep @@ -199,7 +199,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_qam/15_installation.xml.ep b/data/autoyast_qam/15_installation.xml.ep index 7a607eaac6db..863c25c53e5f 100644 --- a/data/autoyast_qam/15_installation.xml.ep +++ b/data/autoyast_qam/15_installation.xml.ep @@ -168,7 +168,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/autoyast_sles12sp3+alladdons_allpatterns_reg_full_s390x.xml b/data/autoyast_sle12/autoyast_sles12sp3+alladdons_allpatterns_reg_full_s390x.xml index aae97f4ad80e..80b1632babc1 100644 --- a/data/autoyast_sle12/autoyast_sles12sp3+alladdons_allpatterns_reg_full_s390x.xml +++ b/data/autoyast_sle12/autoyast_sles12sp3+alladdons_allpatterns_reg_full_s390x.xml @@ -354,7 +354,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/autoyast_sles12sp3+alladdons_default_reg_full_s390x.xml b/data/autoyast_sle12/autoyast_sles12sp3+alladdons_default_reg_full_s390x.xml index d4ca779d03ef..886ed098ccf1 100644 --- a/data/autoyast_sle12/autoyast_sles12sp3+alladdons_default_reg_full_s390x.xml +++ b/data/autoyast_sle12/autoyast_sles12sp3+alladdons_default_reg_full_s390x.xml @@ -311,7 +311,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_allpatterns_reg_full_s390x.xml b/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_allpatterns_reg_full_s390x.xml index f555f3b005e2..2fcad72dfa5b 100644 --- a/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_allpatterns_reg_full_s390x.xml +++ b/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_allpatterns_reg_full_s390x.xml @@ -269,7 +269,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_default_reg_full_s390x.xml b/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_default_reg_full_s390x.xml index 3bdb09498802..e924d6f24675 100644 --- a/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_default_reg_full_s390x.xml +++ b/data/autoyast_sle12/autoyast_sles12sp3+sdk+ha+geo_default_reg_full_s390x.xml @@ -233,7 +233,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/autoyast_sles12sp3_allpatterns_reg_full_s390x.xml b/data/autoyast_sle12/autoyast_sles12sp3_allpatterns_reg_full_s390x.xml index b4d8ee518938..940510c7d114 100644 --- a/data/autoyast_sle12/autoyast_sles12sp3_allpatterns_reg_full_s390x.xml +++ b/data/autoyast_sle12/autoyast_sles12sp3_allpatterns_reg_full_s390x.xml @@ -213,7 +213,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/autoyast_sles12sp3_default_reg_full_s390x.xml b/data/autoyast_sle12/autoyast_sles12sp3_default_reg_full_s390x.xml index 1d4200df6292..1cb4ca75712c 100644 --- a/data/autoyast_sle12/autoyast_sles12sp3_default_reg_full_s390x.xml +++ b/data/autoyast_sle12/autoyast_sles12sp3_default_reg_full_s390x.xml @@ -181,7 +181,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/autoyast_sle12/ay.xml b/data/autoyast_sle12/ay.xml index 99c5be9446a7..d45cb1e053b4 100644 --- a/data/autoyast_sle12/ay.xml +++ b/data/autoyast_sle12/ay.xml @@ -361,7 +361,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/qam/dracut/12-SP2_custom_lvm.xml.ep b/data/qam/dracut/12-SP2_custom_lvm.xml.ep index 040d076cdc08..d3856a8f13e1 100644 --- a/data/qam/dracut/12-SP2_custom_lvm.xml.ep +++ b/data/qam/dracut/12-SP2_custom_lvm.xml.ep @@ -291,7 +291,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/qam/dracut/12-SP2_custom_usr.xml.ep b/data/qam/dracut/12-SP2_custom_usr.xml.ep index 1dc0d7582137..9969487f8ea3 100644 --- a/data/qam/dracut/12-SP2_custom_usr.xml.ep +++ b/data/qam/dracut/12-SP2_custom_usr.xml.ep @@ -217,7 +217,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/qam/dracut/12_custom_lvm.xml.ep b/data/qam/dracut/12_custom_lvm.xml.ep index fca342dc32ae..5ff1dc0e40be 100644 --- a/data/qam/dracut/12_custom_lvm.xml.ep +++ b/data/qam/dracut/12_custom_lvm.xml.ep @@ -291,7 +291,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/yam/autoyast/support_images/create_hdd_ha_sles.xml.ep b/data/yam/autoyast/support_images/create_hdd_ha_sles.xml.ep index 5cfed0006d48..2ab0818b36ee 100644 --- a/data/yam/autoyast/support_images/create_hdd_ha_sles.xml.ep +++ b/data/yam/autoyast/support_images/create_hdd_ha_sles.xml.ep @@ -156,7 +156,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/yam/autoyast/support_images/create_hdd_sles_regression_aarch64.xml.ep b/data/yam/autoyast/support_images/create_hdd_sles_regression_aarch64.xml.ep index 0f6f23070689..8f5243451866 100644 --- a/data/yam/autoyast/support_images/create_hdd_sles_regression_aarch64.xml.ep +++ b/data/yam/autoyast/support_images/create_hdd_sles_regression_aarch64.xml.ep @@ -156,7 +156,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/yam/autoyast/support_images/create_hdd_sles_regression_s390x.xml.ep b/data/yam/autoyast/support_images/create_hdd_sles_regression_s390x.xml.ep index c6853e1d367e..581840a03a78 100644 --- a/data/yam/autoyast/support_images/create_hdd_sles_regression_s390x.xml.ep +++ b/data/yam/autoyast/support_images/create_hdd_sles_regression_s390x.xml.ep @@ -104,7 +104,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/yam/autoyast/support_images/sles12sp5_install_all_patterns_s390x.xml b/data/yam/autoyast/support_images/sles12sp5_install_all_patterns_s390x.xml index ebdad6c07082..a3dc676a4a48 100644 --- a/data/yam/autoyast/support_images/sles12sp5_install_all_patterns_s390x.xml +++ b/data/yam/autoyast/support_images/sles12sp5_install_all_patterns_s390x.xml @@ -88,7 +88,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } - diff --git a/data/yam/autoyast/support_images/sles12sp5_install_default_patterns_s390x.xml b/data/yam/autoyast/support_images/sles12sp5_install_default_patterns_s390x.xml index f6c26182675e..fe302db1205a 100644 --- a/data/yam/autoyast/support_images/sles12sp5_install_default_patterns_s390x.xml +++ b/data/yam/autoyast/support_images/sles12sp5_install_default_patterns_s390x.xml @@ -81,7 +81,12 @@ default eth0 + % if ( $get_var->('WORKER_HOSTNAME') =~ /prg2/ ) { + 10.145.10.254 + % } + % if ( $get_var->('WORKER_HOSTNAME') =~ /nue2/ ) { 10.161.159.254 + % } -