From 2087555c7da05d58c3ea2e4b4d140f0f32edcc4f Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 20 Oct 2025 11:17:07 +1300 Subject: [PATCH 1/3] Add ironic-graphical-console container --- container-images/containers.yaml | 2 ++ .../ironic-graphical-console.yaml | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml diff --git a/container-images/containers.yaml b/container-images/containers.yaml index 2bf1676f..32204bb8 100644 --- a/container-images/containers.yaml +++ b/container-images/containers.yaml @@ -36,7 +36,9 @@ container_images: - imagename: quay.io/podified-master-centos9/openstack-horizontest:current-podified - imagename: quay.io/podified-master-centos9/openstack-ironic-api:current-podified - imagename: quay.io/podified-master-centos9/openstack-ironic-conductor:current-podified +- imagename: quay.io/podified-master-centos9/openstack-ironic-graphical-console:current-podified - imagename: quay.io/podified-master-centos9/openstack-ironic-inspector:current-podified +- imagename: quay.io/podified-master-centos9/openstack-ironic-novncproxy:current-podified - imagename: quay.io/podified-master-centos9/openstack-ironic-pxe:current-podified - imagename: quay.io/podified-master-centos9/openstack-ironic-neutron-agent:current-podified - imagename: quay.io/podified-master-centos9/openstack-iscsid:current-podified diff --git a/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml b/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml new file mode 100644 index 00000000..296bb51d --- /dev/null +++ b/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml @@ -0,0 +1,29 @@ + +tcib_envs: + DISPLAY_WIDTH: "1280" + DISPLAY_HEIGHT: "960" + APP: "fake" + APP_INFO: "{}" + READ_ONLY: "False" + DEBUG: "0" + FIREFOX: "firefox" + FIREFOX_CONFIG_DIR: "/var/lib/ironic/.mozilla/firefox" + EXTENSION_PATH: "/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/@ironic-console.openstack.org" +tcib_actions: +- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf +- run: cp -r /usr/share/ironic/vnc-container/bin/* /usr/local/bin/ +- run: cp -r /usr/share/ironic/vnc-container/drivers / +- run: cp -r /usr/share/ironic/vnc-container/extension /usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/@ironic-console.openstack.org +tcib_cmd: /usr/local/bin/start-x11vnc.sh +tcib_entrypoint: dumb-init -- +tcib_packages: + common: + - firefox + - dumb-init + - iproute + - procps + - psmisc + - python3-requests + - x11vnc + - xorg-x11-server-Xvfb +tcib_user: ironic From e9a7c9086861a28fc0f8c5395f50fbf8880ff3a0 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 20 Oct 2025 11:43:33 +1300 Subject: [PATCH 2/3] DNM enable EPEL --- .../ironic-graphical-console/ironic-graphical-console.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml b/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml index 296bb51d..b458dd6c 100644 --- a/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml +++ b/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml @@ -10,7 +10,7 @@ tcib_envs: FIREFOX_CONFIG_DIR: "/var/lib/ironic/.mozilla/firefox" EXTENSION_PATH: "/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/@ironic-console.openstack.org" tcib_actions: -- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf +- run: dnf -y install epel-release && dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: cp -r /usr/share/ironic/vnc-container/bin/* /usr/local/bin/ - run: cp -r /usr/share/ironic/vnc-container/drivers / - run: cp -r /usr/share/ironic/vnc-container/extension /usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/@ironic-console.openstack.org From ea35ca13ab430be8a19d7b9dde0d4bf13d117e62 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Mon, 20 Oct 2025 11:54:06 +1300 Subject: [PATCH 3/3] DNM Use old chrome based ironic-graphical-console Remove this commit when [1] has landed upstream [1] https://review.opendev.org/c/openstack/ironic/+/961434 --- .../ironic-graphical-console.yaml | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml b/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml index b458dd6c..22eebb86 100644 --- a/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml +++ b/container-images/tcib/base/os/ironic-base/ironic-graphical-console/ironic-graphical-console.yaml @@ -13,17 +13,29 @@ tcib_actions: - run: dnf -y install epel-release && dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf - run: cp -r /usr/share/ironic/vnc-container/bin/* /usr/local/bin/ - run: cp -r /usr/share/ironic/vnc-container/drivers / -- run: cp -r /usr/share/ironic/vnc-container/extension /usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/@ironic-console.openstack.org -tcib_cmd: /usr/local/bin/start-x11vnc.sh +# TODO(stevebaker) uncomment when https://review.opendev.org/c/openstack/ironic/+/961434 lands +# - run: cp -r /usr/share/ironic/vnc-container/extension /usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/@ironic-console.openstack.org +# tcib_cmd: /usr/local/bin/start-x11vnc.sh +tcib_cmd: /usr/local/bin/start-xvfb.sh tcib_entrypoint: dumb-init -- tcib_packages: common: - - firefox + # TODO(stevebaker) replace the below list of packages with this when https://review.opendev.org/c/openstack/ironic/+/961434 lands + # - firefox + # - dumb-init + # - iproute + # - procps + # - psmisc + # - python3-requests + # - x11vnc + # - xorg-x11-server-Xvfb + - chromium + - chromedriver - dumb-init - - iproute - procps - psmisc - python3-requests + - python3-selenium - x11vnc - xorg-x11-server-Xvfb tcib_user: ironic