Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix noVNC session launch and ubuntu image creation #1689

Merged
merged 13 commits into from
Sep 27, 2023
Merged

Fix noVNC session launch and ubuntu image creation #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ae2caf0
fix hostname for centos 79 compute
xpillons Sep 20, 2023
dcd0630
don't run waagent -decommission
xpillons Sep 21, 2023
174f740
deprovision, rename and sync
xpillons Sep 21, 2023
e174600
remove localhost renaming in waagent
xpillons Sep 21, 2023
ace0c7e
grep hostnames from messages
xpillons Sep 21, 2023
0831ab2
don't run waagent deprovision
xpillons Sep 21, 2023
1bd32be
remove localhost from ifcfg-eth0
xpillons Sep 22, 2023
44d88e5
wiped DHCP_HOSTNAME
xpillons Sep 22, 2023
43538d5
fix waagent deprovision for centOS & almalinux
xpillons Sep 25, 2023
665d765
checksum reduced to scripts called
xpillons Sep 26, 2023
44999b1
upgrade amlfs client
xpillons Sep 26, 2023
a3ebfa5
fix ubuntu deprovision and remove lustre client
xpillons Sep 26, 2023
66d97aa
add numpy in centOS
xpillons Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packer/azhop-centos79-desktop3d-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-centos79-desktop3d.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-centos79-v2-rdma-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-centos79-v2-rdma-gpgpu.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-compute-almalinux-8_7-ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
"inline": [
"echo ' This is the end '",
"yum history sync",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-compute-almalinux-8_7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-compute-centos-7_9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
5 changes: 3 additions & 2 deletions packer/azhop-compute-ubuntu-18_04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@
"/tmp/openpbs.sh || exit 1",
"/tmp/slurm.sh || exit 1",
"/tmp/telegraf.sh || exit 1",
"/tmp/lustreclient.sh b2_14 || exit 1",
"/tmp/zz-compute-custom.sh || exit 1",
"echo ' This is the end '",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
5 changes: 3 additions & 2 deletions packer/azhop-compute-ubuntu-20_04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@
"/tmp/openpbs.sh || exit 1",
"/tmp/slurm.sh || exit 1",
"/tmp/telegraf.sh || exit 1",
"/tmp/lustreclient.sh b2_15 || exit 1",
"/tmp/zz-compute-custom.sh || exit 1",
"echo ' This is the end '",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-desktop-almalinux-8_7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-desktop-centos-7_9-gen1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/azhop-desktop-centos-7_9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
5 changes: 3 additions & 2 deletions packer/azhop-desktop-ubuntu-20_04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@
"/tmp/openpbs.sh || exit 1",
"/tmp/slurm.sh || exit 1",
"/tmp/telegraf.sh || exit 1",
"/tmp/lustreclient.sh b2_15 || exit 1",
"/tmp/interactive-desktop-3d.sh || exit 1",
"/tmp/desktop-packages.sh || exit 1",
"/tmp/zz-desktop-custom.sh || exit 1",
"echo ' This is the end '",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/^send host-name =.*/send host-name = \"\"/' /etc/dhcp/dhclient.conf",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
4 changes: 3 additions & 1 deletion packer/base-centos79-v2-rdma.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
"echo ' This is the end '",
"yum history sync",
"rm -rf /tmp/*.sh",
"/usr/sbin/waagent -force -deprovision+user && export HISTSIZE=0 && sync"
"/usr/sbin/waagent -force -deprovision+user",
"sed -i 's/localhost.localdomain//g' /etc/sysconfig/network-scripts/ifcfg-eth0",
"export HISTSIZE=0 && sync"
],
"inline_shebang": "/bin/sh -x",
"type": "shell",
Expand Down
3 changes: 2 additions & 1 deletion packer/build_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ image_id=$(az image list -g $resource_group --query "[?name=='$image_name'].id"

# Generate install script checksum
set +e
find ./scripts/ -exec md5sum {} \; > md5sum.txt
script_dir=$(jq -r '.provisioners[0].source' $PACKER_FILE)
find $script_dir -exec md5sum {} \; > md5sum.txt
md5sum $PACKER_FILE >> md5sum.txt
set -e
packer_md5=$(md5sum md5sum.txt | cut -d' ' -f 1)
Expand Down
2 changes: 2 additions & 0 deletions packer/scripts/centos/interactive-desktop-3d.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ yum groupinstall -y xfce
yum install -y https://yum.osc.edu/ondemand/3.0/compute/el7/x86_64/turbovnc-2.2.5-1.el7.x86_64.rpm
#yum install -y https://cbs.centos.org/kojifiles/packages/python-websockify/0.8.0/13.el7/noarch/python2-websockify-0.8.0-13.el7.noarch.rpm
yum install -y https://yum.osc.edu/ondemand/3.0/compute/el7/x86_64/python3-websockify-0.10.0-1.el7.noarch.rpm
# Numpy is required to optimize HyBi protocol in websockify
pip3 install numpy

wget --no-check-certificate "https://virtualgl.com/pmwiki/uploads/Downloads/VirtualGL.repo" -O /etc/yum.repos.d/VirtualGL.repo

Expand Down
2 changes: 1 addition & 1 deletion packer/scripts/ubuntu/lustreclient.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
LUSTRE_VERSION=2.15.1-24-gbaa21ca
LUSTRE_VERSION=2.15.1-29-gbae0abe

source /etc/lsb-release
echo "deb [arch=amd64] https://packages.microsoft.com/repos/amlfs-${DISTRIB_CODENAME}/ ${DISTRIB_CODENAME} main" | tee /etc/apt/sources.list.d/amlfs.list
Expand Down