Merge "Support extflash in nexus-non-interactive-test.sh"
diff --git a/install-prereqs.sh b/install-prereqs.sh
index 57a896d..ee5442b 100755
--- a/install-prereqs.sh
+++ b/install-prereqs.sh
@@ -75,6 +75,8 @@
mono-complete
ncurses-dev
ninja-build
+ openjdk-17-jdk-headless
+ openjdk-17-jre-headless
perl
protobuf-compiler
pv
diff --git a/preupload-hooks/ansible-checks.sh b/preupload-hooks/ansible-checks.sh
index 380fdd5..69d650b 100755
--- a/preupload-hooks/ansible-checks.sh
+++ b/preupload-hooks/ansible-checks.sh
@@ -18,24 +18,12 @@
set -e
-ANSIBLE_CHANGE=0
ANSIBLE_PATH=$1
-shift
-
-# Check to see if any changed files are in the ansible path
-for FILE in $@; do
- if [[ $FILE == $ANSIBLE_PATH* ]]; then
- ANSIBLE_CHANGE=1
- break
- fi
-done
-
-if (( ANSIBLE_CHANGE == 1 )); then
- if ! command -v ansible-lint >/dev/null; then
- echo "Command ansible-lint not found. Install the ansible-lint package."
- exit 1
- fi
-
- # Run ansible checks. Just lint for now
- ansible-lint $ANSIBLE_PATH
+if ! command -v ansible-lint >/dev/null; then
+ echo "Command ansible-lint not found. Install the ansible-lint package."
+ exit 1
fi
+
+# Run ansible checks. Just lint for now
+cd $(dirname ${ANSIBLE_PATH})
+ansible-lint $(basename ${ANSIBLE_PATH})
diff --git a/python-requirements.txt b/python-requirements.txt
index d15022f..326d72a 100644
--- a/python-requirements.txt
+++ b/python-requirements.txt
@@ -17,6 +17,9 @@
sortedcontainers
hypothesis
+# Robot test framework for FPGA tests
+pyserial
+
# camkes-deps
hjson
@@ -35,6 +38,6 @@
sel4-deps
setuptools
# TODO(lundong): not pin nightly after TOSA features are in release ver.
-tf-nightly==2.14.0.dev20230705
+tf-nightly==2.15.0.dev20230817
wget
yapf
