Merge #643: jade: fix CI cached python env issue

b6fda26 jade: fix CI cached python env issue (Jamie C. Driver)

Pull request description:

  Fix issue for Jade's 'build simulator' CI step not finding python virtualenv when cached

ACKs for top commit:
  achow101:
    ACK b6fda26

Tree-SHA512: d1026e9bcc9ea25e7aaa1c9e85d5d046be342e4481fc2a76292f23b3e7fbf3647d1052715bcc9f60e1dfeafa8885071657809f9d799a43c86d344ac3a423d552

test/setup_environment.sh

@@ -382,13 +382,19 @@ if [[ -n ${build_jade} ]]; then
 
         git checkout ${ESP_IDF_COMMIT}
         git submodule update --recursive --init
-
-        # Only install the tools we need (ie. esp32)
-        rm -fr ${IDF_TOOLS_PATH}
-        ./install.sh esp32
         cd ..
     fi
 
+    # Install the tools every run regardless
+    # (Otherwise a cached CI run which skips the above esp-idf clone does not
+    # always seem to pick up the locally installed python virtualenv, and instead uses
+    # the system python/no-virtualenv which fails ...)
+    # Only install the tools we need (ie. esp32)
+    cd esp-idf
+    rm -fr ${IDF_TOOLS_PATH}
+    ./install.sh esp32
+    cd ..
+
     # Export the tools
     . ./esp-idf/export.sh