Updated terraform commit and deploy.sh script.

schutzbot/deploy.sh

@@ -11,7 +11,7 @@ PROJECT=${1:-osbuild-composer}
 
 # set locale to en_US.UTF-8
 sudo dnf install -y glibc-langpack-en
-localectl set-locale LANG=en_US.UTF-8
+sudo localectl set-locale LANG=en_US.UTF-8
 
 # Colorful output.
 function greenprint {
@@ -26,7 +26,7 @@ function retry {
         count=$((count + 1))
         if [[ $count -lt $retries ]]; then
             echo "Retrying command..."
-            sleep 5
+            sleep 1
         else
             echo "Command failed after ${retries} retries. Giving up."
             return $exit
@@ -111,9 +111,7 @@ function get_last_passed_commit {
 }
 
 # Get OS details.
-source /etc/os-release
-ARCH=$(uname -m)
-DISTRO_CODE="${DISTRO_CODE:-${ID}-${VERSION_ID//./}}"
+source ci/set-env-variables.sh
 
 if [[ $ID == "rhel" && ${VERSION_ID%.*} == "9" ]]; then
   # There's a bug in RHEL 9 that causes /tmp to be mounted on tmpfs.
@@ -184,7 +182,7 @@ greenprint "Installing test packages for ${PROJECT}"
 retry sudo dnf -y upgrade selinux-policy
 
 # Note: installing only -tests to catch missing dependencies
-retry sudo dnf -y install "${PROJECT}-tests" 
+retry sudo dnf -y install "${PROJECT}-tests"
 
 # Save osbuild-composer NVR to a file to be used as CI artifact
 rpm -q osbuild-composer > COMPOSER_NVR
@@ -218,4 +216,4 @@ if [ -n "${CI}" ]; then
     # copy repo files b/c GitLab can't upload artifacts
     # which are outside the build directory
     cp /etc/yum.repos.d/*.repo "$(pwd)"
-fi
+fi

schutzbot/terraform

@@ -1 +1 @@
-c5b892302b318d629f9b205dff173238dfe26a18
+2c51ba92065231c4986894cc2bc214dea1b2c157