Fix tofu ci env

Author: wtripp180901

tofu/tests/setup-and-run-ci-env.sh

@@ -122,22 +122,29 @@ echo "Running additional tests..."
 
 # Set up some variables
 CONTENT_TYPE="Content-Type: application/json"
-TF_VAR_coral_uri=http://$SITE:$PORT
+export TF_VAR_coral_uri=http://$SITE:$PORT
 
 # Get a token
 echo "Getting an auth token:"
-TF_VAR_auth_token=$(curl -s -X POST -H "$CONTENT_TYPE" -d \
+export TF_VAR_auth_token=$(curl -s -X POST -H "$CONTENT_TYPE" -d \
     "{
         \"username\": \"admin\", 
         \"password\": \"$TEST_PASSWORD\"
     }" \
     ${TF_VAR_coral_uri}/api-token-auth/ | jq -r '.token')
 echo "Auth Token: $TF_VAR_auth_token"
 
-python -m venv venv
-source venv/bin/active
+# Install OpenTofu
+curl --proto '=https' --tlsv1.2 -fsSL https://get.opentofu.org/install-opentofu.sh -o install-opentofu.sh
+chmod +x install-opentofu.sh
+./install-opentofu.sh --install-method deb
+rm -f install-opentofu.sh
+
+# Install python dependencies
 pip install -r ${SCRIPT_DIR}/../../requirements.txt
+pip install -r ${SCRIPT_DIR}/../../test-requirements.txt
 
+# Run tests
 pytest ${SCRIPT_DIR}/tofu_tests.py
 
 # Scrape prometheus metrics: 

tools/functional_test.sh

@@ -230,7 +230,7 @@ RESPONSE=$(curl -s -w "%{http_code}" -X POST -H "$AUTH_HEADER" -H "$CONTENT_TYPE
             }
         }
     }" \
-    http://$SITE:$PORT/consumer/create/)
+    http://$SITE:$PORT/consumer/create)
 
 if [ "$RESPONSE" -eq 204 ]; then
 		echo "All tests completed."