cleaning

nsg-ethz · Sep 17, 2023 · 136e4cc · 136e4cc
1 parent 5d57129
commit 136e4cc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/install-tools/install-p4-dev.sh b/install-tools/install-p4-dev.sh
@@ -30,8 +30,7 @@ FRROUTING=true
 DOCUMENTATION=true
 
 # p4-utils branch 
-# TODO: improve this in the future
-P4_UTILS_BRANCH="update-p4-tools"
+P4_UTILS_BRANCH="master"
 
 # Software versions
 

diff --git a/install-tools/old_installs/install-p4-dev.sh b/install-tools/old_installs/install-p4-dev.sh
@@ -9,8 +9,7 @@
 # Furthermore, we install p4-utils and p4-learning and ffr routers.
 
 # This install script has only been tested with the following systems:
-# Ubuntu 20.04
-# Ubuntu 22.04
+# Ubuntu 18.04
 
 # Configuration variables
 # Currently loaded linux kernel
@@ -59,7 +58,7 @@ LIBYANG_COMMIT="v${LIBYANG_VER}"
 
 # p4-utils branch 
 # TODO: improve this in the future
-P4_UTILS_BRANCH="update-p4-tools"
+P4_UTILS_BRANCH="master"
 
 # Print commands and exit on errors
 set -xe

diff --git a/vm/qemu.pkr.hcl b/vm/qemu.pkr.hcl
@@ -93,7 +93,7 @@ build {
       "      dhcp4: yes",
       "EOF'",
       "sudo apt-get install -y git curl",
-      "curl -sSL https://raw.githubusercontent.com/nsg-ethz/p4-utils/update-p4-tools/install-tools/install-p4-dev.sh | bash"
+      "curl -sSL https://raw.githubusercontent.com/nsg-ethz/p4-utils/master/install-tools/install-p4-dev.sh | bash"
     ]
   }
 }
diff --git a/vm/qemu20.pkr.hcl b/vm/qemu20.pkr.hcl
@@ -93,7 +93,7 @@ build {
       "      dhcp4: yes",
       "EOF'",
       "sudo apt-get install -y git curl",
-      "curl -sSL https://raw.githubusercontent.com/nsg-ethz/p4-utils/update-p4-tools/install-tools/install-p4-dev-ubuntu20.sh | bash"
+      "curl -sSL https://raw.githubusercontent.com/nsg-ethz/p4-utils/master/install-tools/install-p4-dev-ubuntu20.sh | bash"
     ]
   }
 }