Skip to content

Commit 86cb653

Browse files
committed
deps: move nodejs installation to e2e script
to fix the issue happening in these runs https://jenkins.ceph.com/job/ceph-dashboard-cephadm-e2e-nightly-quincy/201/console ``` + sudo apt-get update Ign:1 https://chacra.ceph.com/r/vagrant/latest/HEAD/ubuntu/jammy/flavors/default jammy InRelease Hit:2 https://chacra.ceph.com/r/vagrant/latest/HEAD/ubuntu/jammy/flavors/default jammy Release Ign:3 https://chacra.ceph.com/r/vagrant/latest/HEAD/ubuntu/jammy/flavors/default jammy Release.gpg Hit:4 https://dl.google.com/linux/chrome/deb stable InRelease Ign:5 https://4.chacra.ceph.com/r/cortx-motr/master/39f89fa1c6945040433a913f2687c4b4e6cbeb3f/ubuntu/jammy/flavors/default jammy InRelease Hit:6 https://4.chacra.ceph.com/r/cortx-motr/master/39f89fa1c6945040433a913f2687c4b4e6cbeb3f/ubuntu/jammy/flavors/default jammy Release Hit:7 http://archive.ubuntu.com/ubuntu jammy InRelease Get:8 http://security.ubuntu.com/ubuntu jammy-security InRelease [110 kB] Ign:9 https://4.chacra.ceph.com/r/cortx-motr/master/39f89fa1c6945040433a913f2687c4b4e6cbeb3f/ubuntu/jammy/flavors/default jammy Release.gpg Get:10 http://archive.ubuntu.com/ubuntu jammy-updates InRelease [114 kB] Get:11 http://archive.ubuntu.com/ubuntu jammy-backports InRelease [99.8 kB] Get:12 http://archive.ubuntu.com/ubuntu jammy-updates/main amd64 Packages [502 kB] Ign:13 https://deb.nodesource.com/node_12.x jammy InRelease Get:14 http://archive.ubuntu.com/ubuntu jammy-updates/main i386 Packages [269 kB] Get:15 http://archive.ubuntu.com/ubuntu jammy-updates/main Translation-en [119 kB] Get:16 http://archive.ubuntu.com/ubuntu jammy-updates/universe amd64 Packages [210 kB] Get:17 http://archive.ubuntu.com/ubuntu jammy-updates/universe i386 Packages [113 kB] Get:18 http://archive.ubuntu.com/ubuntu jammy-updates/universe Translation-en [69.8 kB] Err:19 https://deb.nodesource.com/node_12.x jammy Release 404 Not Found [IP: 23.34.63.88 443] Reading package lists... E: The repository 'https://deb.nodesource.com/node_12.x jammy Release' does not have a Release file. ``` Signed-off-by: Nizamudeen A <nia@redhat.com>
1 parent c390355 commit 86cb653

2 files changed

Lines changed: 17 additions & 19 deletions

File tree

scripts/dashboard/install-cephadm-e2e-deps.sh

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,6 @@ sudo apt update -y
2020
sudo apt install -y apt-transport-https ca-certificates curl gnupg lsb-release \
2121
openssh-server software-properties-common
2222

23-
NODEJS_MAJOR_VERSION=14
24-
DISTRO="$(lsb_release -cs)"
25-
if [[ ! $(command -v node) || $(node --version | grep -oE "v([0-9])+" | cut -c 2-) < ${NODEJS_MAJOR_VERSION} ]]; then
26-
sudo add-apt-repository -y -r ppa:chris-lea/node.js
27-
sudo rm -f /etc/apt/sources.list.d/chris-lea-node_js-*.list
28-
sudo rm -f /etc/apt/sources.list.d/chris-lea-node_js-*.list.save
29-
30-
NODEJS_KEYRING=/usr/share/keyrings/nodesource.gpg
31-
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | sudo tee "${NODEJS_KEYRING}" >/dev/null
32-
gpg --no-default-keyring --keyring "${NODEJS_KEYRING}" --list-keys
33-
34-
NODEJS_VERSION="node_${NODEJS_MAJOR_VERSION}.x"
35-
echo "deb [signed-by=${NODEJS_KEYRING}] https://deb.nodesource.com/${NODEJS_VERSION} ${DISTRO} main" | sudo tee /etc/apt/sources.list.d/nodesource.list
36-
echo "deb-src [signed-by=${NODEJS_KEYRING}] https://deb.nodesource.com/${NODEJS_VERSION} ${DISTRO} main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list
37-
38-
sudo apt update -y
39-
sudo apt install -y nodejs
40-
sudo rm -f /etc/apt/sources.list.d/nodesource.list
41-
fi
4223
sudo apt install -y libvirt-daemon-system libvirt-daemon-driver-qemu qemu-kvm libvirt-clients runc
4324

4425
sudo usermod -aG libvirt $(id -un)

scripts/dashboard/install-e2e-test-deps.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ if [[ ! $(arch) =~ (i386|x86_64|amd64) ]]; then
77
fi
88

99
if grep -q debian /etc/*-release; then
10+
NODEJS_MAJOR_VERSION=14
11+
DISTRO="$(lsb_release -cs)"
12+
if [[ ! $(command -v node) || $(node --version | grep -oE "v([0-9])+" | cut -c 2-) < ${NODEJS_MAJOR_VERSION} ]]; then
13+
sudo apt-get purge nodejs -y
14+
15+
NODEJS_KEYRING=/usr/share/keyrings/nodesource.gpg
16+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | sudo tee "${NODEJS_KEYRING}" >/dev/null
17+
gpg --no-default-keyring --keyring "${NODEJS_KEYRING}" --list-keys
18+
19+
NODEJS_VERSION="node_${NODEJS_MAJOR_VERSION}.x"
20+
echo "deb [signed-by=${NODEJS_KEYRING}] https://deb.nodesource.com/${NODEJS_VERSION} ${DISTRO} main" | sudo tee /etc/apt/sources.list.d/nodesource.list
21+
echo "deb-src [signed-by=${NODEJS_KEYRING}] https://deb.nodesource.com/${NODEJS_VERSION} ${DISTRO} main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list
22+
23+
sudo apt update -y
24+
sudo apt install -y nodejs
25+
sudo rm -f /etc/apt/sources.list.d/nodesource.list
26+
fi
1027
sudo bash -c 'echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list'
1128
curl -fsSL https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
1229
sudo apt-get update

0 commit comments

Comments
 (0)