Updates for 2025-Jul-01 (#691)

* Move optional steps for testing VMs out of README.md file
This may help avoid new users being confused that they must follow
those instructions.

Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>

* Add 2025-Jan-30 versions of source code for install.sh

Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>

* Updates to tutorials install script for 2025-Jul-01

Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>

---------

Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>

Author: jafingerhut

vm-ubuntu-24.04/install.sh

@@ -26,17 +26,12 @@ print_usage() {
     1>&2 echo "usage: $0 [ latest | <date> ]"
     1>&2 echo ""
     1>&2 echo "Dates supported:"
-    1>&2 echo "    2025-Jun-01"
-    1>&2 echo "    2025-May-01"
-    1>&2 echo "    2025-Apr-01"
-    1>&2 echo "    2025-Mar-01"
-    1>&2 echo "    2025-Feb-01"
-    1>&2 echo "    2025-Jan-01"
+    1>&2 echo "    2025-Jul-01"
 }
 
 if [ $# -eq 0 ]
 then
-    VERSION="2025-May-01"
+    VERSION="2025-Jul-01"
     echo "No version specified.  Defaulting to ${VERSION}"
 elif [ $# -eq 1 ]
 then
@@ -47,41 +42,11 @@ else
 fi
 
 case ${VERSION} in
-    2025-Jan-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="7ca39eda3529347e4ba66f1976351b0087294bf8"
-	export INSTALL_PI_SOURCE_VERSION="2bb40f7ab800b91b26f3aed174bbbfc739a37ffa"
-	export INSTALL_P4C_SOURCE_VERSION="1dc0afae2207f4bb9f5ab45f105ed569cc1ac89b"
-	export INSTALL_PTF_SOURCE_VERSION="c554f83685186be4cfa9387eb5d6d700d2bbd7c0"
-	;;
-    2025-Feb-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="892c42198082d3252f4c6facc7363c02ca1d71d2"
-	export INSTALL_PI_SOURCE_VERSION="c3abb96d61f91e4f641aecd7ba2e784870c35290"
-	export INSTALL_P4C_SOURCE_VERSION="2776b1948529bc7e8ccfb2f6ea2a9c1ab1f68796"
-	export INSTALL_PTF_SOURCE_VERSION="c554f83685186be4cfa9387eb5d6d700d2bbd7c0"
-	;;
-    2025-Mar-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="d12eefc7bc19fb4da615b1b45c1235899f2e4fb1"
-	export INSTALL_PI_SOURCE_VERSION="17802cfd67218a26307c0ea69fe520751ca6ab64"
-	export INSTALL_P4C_SOURCE_VERSION="3ffac66ee232f2ab9d1860751dde94725d3b1af8"
-	export INSTALL_PTF_SOURCE_VERSION="77a5ba448f3db54b45a03a6235b7cec8c8c7d093"
-	;;
-    2025-Apr-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="d12eefc7bc19fb4da615b1b45c1235899f2e4fb1"
-	export INSTALL_PI_SOURCE_VERSION="17802cfd67218a26307c0ea69fe520751ca6ab64"
-	export INSTALL_P4C_SOURCE_VERSION="1d456721080836ecf9afc7daaf17147332173620"
-	export INSTALL_PTF_SOURCE_VERSION="e29ef7ec0bd34d4ceef88016383e53238ab5383c"
-	;;
-    2025-May-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="c0ff3aba77a78ed08dfcb8634f0875fa172e18ab"
-	export INSTALL_PI_SOURCE_VERSION="17802cfd67218a26307c0ea69fe520751ca6ab64"
-	export INSTALL_P4C_SOURCE_VERSION="305ca61bfd1c3f13206dd4733ca3b8c56145a19f"
-	export INSTALL_PTF_SOURCE_VERSION="e29ef7ec0bd34d4ceef88016383e53238ab5383c"
-	;;
-    2025-Jun-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="c0ff3aba77a78ed08dfcb8634f0875fa172e18ab"
+    2025-Jul-01)
+	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="8b6950b9aaff2b89eecd6da63191e1a88be242af"
 	export INSTALL_PI_SOURCE_VERSION="d28b31e4fa05b51f93b9810f5a3ef4a57fbfb8a8"
-	export INSTALL_P4C_SOURCE_VERSION="45bbb002e86e5dafcbbb61499d122bb9982698c6"
-	export INSTALL_PTF_SOURCE_VERSION="e29ef7ec0bd34d4ceef88016383e53238ab5383c"
+	export INSTALL_P4C_SOURCE_VERSION="4a922a2249c7778d72e7247eeb3be4ed7725c0aa"
+	export INSTALL_PTF_SOURCE_VERSION="6af750831ffe14512c5195383f2b39691744503e"
 	;;
     latest)
 	echo "Using the latest version of all p4lang repository source code."

vm-ubuntu-24.04/patches/behavioral-model-support-venv.patch

@@ -8,10 +8,10 @@ index 558d2a0..b7d0d76 100644
 -sudo pip3 install nnpy cffi
 +pip3 install nnpy cffi
 diff --git a/ci/install-thrift.sh b/ci/install-thrift.sh
-index c3f7a2e..1805da3 100644
+index 1316476..ea6203c 100644
 --- a/ci/install-thrift.sh
 +++ b/ci/install-thrift.sh
-@@ -3,17 +3,13 @@
+@@ -3,22 +3,18 @@
  THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
  source $THIS_DIR/common.sh
 
@@ -27,9 +27,14 @@ index c3f7a2e..1805da3 100644
 +git clone -b 0.16.0 https://github.com/apache/thrift.git thrift-0.16.0
 +cd thrift-0.16.0
  ./bootstrap.sh
--./configure --with-cpp=yes --with-c_glib=no --with-java=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no
-+./configure --with-cpp=yes --with-c_glib=no --with-java=no --with-ruby=no --with-erlang=no --with-go=no --with-nodejs=no --with-python=no
- make -j2 && sudo make install
+ ./configure --with-as3=no --with-c_glib=no --with-csharp=no --with-cpp=yes \
+     --with-cl=no --with-d=no --with-dart=no --with-dotnetcore=no \
+     --with-erlang=no --with-go=no --with-haskell=no --with-haxe=no \
+     --with-java=no --with-lua=no --with-nodejs=no --with-nodets=no \
+-    --with-perl=no --with-php=no --with-python=yes --with-py3=no \
++    --with-perl=no --with-php=no --with-python=no --with-py3=no \
+     --with-qt5=no --with-ruby=no --with-rs=no --with-swift=no
+ make -j4 && sudo make install
 -cd lib/py
 -sudo python3 setup.py install
 -cd ../../..