chore: using apt-get instead of apt

apt is not suited for scripting, we must use apt-get instead.
replicatedhq · Oct 4, 2023 · c684948 · c684948
1 parent 59acad4
commit c684948
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -37,8 +37,8 @@ jobs:
         sudo lxd waitready
     - name: Install and configure OVN
       run: |
-        sudo apt update -y
-        sudo apt install ovn-host ovn-central -y
+        sudo apt-get update -y
+        sudo apt-get install ovn-host ovn-central -y
         sudo ovs-vsctl set open_vswitch .                            \
              external_ids:ovn-remote=unix:/var/run/ovn/ovnsb_db.sock \
              external_ids:ovn-encap-type=geneve                      \

diff --git a/e2e/embed_test.go b/e2e/embed_test.go
@@ -19,8 +19,8 @@ func TestEmbedAndInstall(t *testing.T) {
 	defer tc.Destroy()
 	t.Log("installing ssh in node 0")
 	commands := [][]string{
-		{"apt", "update", "-y"},
-		{"apt", "install", "openssh-server", "-y"},
+		{"apt-get", "update", "-y"},
+		{"apt-get", "install", "openssh-server", "-y"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail to install ssh on node %s: %v", tc.Nodes[0], err)
@@ -45,8 +45,8 @@ func TestEmbedAddonsOnly(t *testing.T) {
 	defer tc.Destroy()
 	t.Log("installing ssh in node 0")
 	commands := [][]string{
-		{"apt", "update", "-y"},
-		{"apt", "install", "openssh-server", "-y"},
+		{"apt-get", "update", "-y"},
+		{"apt-get", "install", "openssh-server", "-y"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail to install ssh on node %s: %v", tc.Nodes[0], err)

diff --git a/e2e/install_test.go b/e2e/install_test.go
@@ -21,8 +21,8 @@ func TestTokenBasedMultiNodeInstallation(t *testing.T) {
 	defer tc.Destroy()
 	t.Log("installing ssh on node 0")
 	commands := [][]string{
-		{"apt", "update", "-y"},
-		{"apt", "install", "openssh-server", "-y"},
+		{"apt-get", "update", "-y"},
+		{"apt-get", "install", "openssh-server", "-y"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail to install ssh on node %s: %v", tc.Nodes[0], err)
@@ -82,8 +82,8 @@ func TestSingleNodeInstallation(t *testing.T) {
 	defer tc.Destroy()
 	t.Log("installing ssh on node 0")
 	commands := [][]string{
-		{"apt", "update", "-y"},
-		{"apt", "install", "openssh-server", "-y"},
+		{"apt-get", "update", "-y"},
+		{"apt-get", "install", "openssh-server", "-y"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail to install ssh on node %s: %v", tc.Nodes[0], err)
@@ -110,8 +110,8 @@ func TestMultiNodeInstallation(t *testing.T) {
 	for i := range tc.Nodes {
 		t.Logf("installing ssh on node %d", i)
 		commands := [][]string{
-			{"apt", "update", "-y"},
-			{"apt", "install", "openssh-server", "-y"},
+			{"apt-get", "update", "-y"},
+			{"apt-get", "install", "openssh-server", "-y"},
 		}
 		if err := RunCommandsOnNode(t, tc, i, commands); err != nil {
 			t.Fatalf("fail to install ssh on node %d: %v", i, err)
@@ -164,8 +164,8 @@ func TestSingleNodeInstallationDebian12(t *testing.T) {
 	defer tc.Destroy()
 	t.Log("installing ssh on node 0")
 	commands := [][]string{
-		{"apt", "update", "-y"},
-		{"apt", "install", "openssh-server", "-y"},
+		{"apt-get", "update", "-y"},
+		{"apt-get", "install", "openssh-server", "-y"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail to install ssh on node 0: %v", err)
@@ -220,15 +220,15 @@ func TestMultiNodeInteractiveInstallation(t *testing.T) {
 	for i := range tc.Nodes {
 		t.Logf("installing ssh on node %d", i)
 		commands := [][]string{
-			{"apt", "update", "-y"},
-			{"apt", "install", "openssh-server", "-y"},
+			{"apt-get", "update", "-y"},
+			{"apt-get", "install", "openssh-server", "-y"},
 		}
 		if err := RunCommandsOnNode(t, tc, i, commands); err != nil {
 			t.Fatalf("fail to install ssh on node %d: %v", i, err)
 		}
 	}
 	t.Logf("installing expect on node 0")
-	line := []string{"apt", "install", "expect", "-y"}
+	line := []string{"apt-get", "install", "expect", "-y"}
 	if _, _, err := RunCommandOnNode(t, tc, 0, line); err != nil {
 		t.Fatalf("fail to install expect on node 0: %v", err)
 	}
@@ -257,8 +257,8 @@ func TestInstallWithDisabledAddons(t *testing.T) {
 	defer tc.Destroy()
 	t.Log("installing ssh in node 0")
 	commands := [][]string{
-		{"apt", "update", "-y"},
-		{"apt", "install", "openssh-server", "-y"},
+		{"apt-get", "update", "-y"},
+		{"apt-get", "install", "openssh-server", "-y"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail to install ssh on node %s: %v", tc.Nodes[0], err)

diff --git a/e2e/scripts/addons-only.sh b/e2e/scripts/addons-only.sh
@@ -21,8 +21,8 @@ wait_for_healthy_node() {
 }
 
 install_helm() {
-    apt update -y
-    if ! apt install -y curl ; then
+    apt-get update -y
+    if ! apt-get install -y curl ; then
         return 1
     fi
     if ! curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 ; then

diff --git a/e2e/scripts/embed-and-install.sh b/e2e/scripts/embed-and-install.sh
@@ -21,8 +21,8 @@ wait_for_healthy_node() {
 }
 
 install_helm() {
-    apt update -y
-    if ! apt install -y curl ; then
+    apt-get update -y
+    if ! apt-get install -y curl ; then
         return 1
     fi
     if ! curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 ; then

diff --git a/e2e/scripts/install-with-disabled-addons.sh b/e2e/scripts/install-with-disabled-addons.sh
@@ -18,8 +18,8 @@ wait_for_healthy_node() {
 }
 
 install_helm() {
-    apt update -y
-    if ! apt install -y curl ; then
+    apt-get update -y
+    if ! apt-get install -y curl ; then
         return 1
     fi
     if ! curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 ; then