Merge pull request #171 from hpidcock/fix-basic-make-check

Fix basic-make-check for non juju/juju repos.
juju · Dec 5, 2023 · f445094 · f445094
2 parents d67e0ec + 35fefc0
commit f445094
Showing 1 changed file with 33 additions and 44 deletions.
diff --git a/jobs/github/scripts/snippet_build_basic-make-check.sh b/jobs/github/scripts/snippet_build_basic-make-check.sh
@@ -1,48 +1,37 @@
-    cd ${{GOPATH}}/src/${{PROJECT_DIR}}
+cd ${GOPATH}/src/${PROJECT_DIR}
 
-    NEEDS_MGO=$(echo "${{NEEDS_MGO}}" | tr '[:upper:]' '[:lower:]')
-    if [ "${{NEEDS_MGO}}" = "true" ]; then
-      action=$(snap info juju-db | grep -q "installed" || echo "install")
-      if [ "$action" == "" ]; then
-              action="refresh"
-      fi
+NEEDS_MGO=$(echo "${NEEDS_MGO}" | tr '[:upper:]' '[:lower:]')
+if [ "${NEEDS_MGO}" = "true" ]; then
+  action=$(snap info juju-db | grep -q "installed" || echo "install")
+  if [ "$action" == "" ]; then
+          action="refresh"
+  fi
 
-      # when running inside a privileged container, snapd fails because udevd isn't
-      # running, but on the second occurance it is.
-      # see: https://github.com/lxc/lxd/issues/4308
-      for i in {1..3}; do
-        echo "${action}ing juju-db snap. Attempt ${i}"
-        if sudo snap $action juju-db --channel=4.4; then
-          echo $action"ed:"
-          # If juju-db is correctly installed, report the version and stop looping
-          which juju-db.mongod && juju-db.mongod --version && break
-       fi
-        sleep 10
-      done
+  # when running inside a privileged container, snapd fails because udevd isn't
+  # running, but on the second occurance it is.
+  # see: https://github.com/lxc/lxd/issues/4308
+  for i in {1..3}; do
+    echo "${action}ing juju-db snap. Attempt ${i}"
+    if sudo snap $action juju-db --channel=4.4; then
+      echo $action"ed:"
+      # If juju-db is correctly installed, report the version and stop looping
+      which juju-db.mongod && juju-db.mongod --version && break
     fi
-    if [ ! -z "${{EXTRA_PACKAGES}}" ]; then
-      echo "Installing packages ${{EXTRA_PACKAGES}}"
-      sudo DEBIAN_FRONTEND=noninteractive apt-get install -y $(echo ${{EXTRA_PACKAGES}} | sed "s/,/ /g")
-    fi
-    if [ ! -z "${{EXTRA_SCRIPT}}" ]; then
-      eval ${{EXTRA_SCRIPT}}
-    fi
-
-    goversion=1.17
-    if [ -f "go.mod" ]; then
-      goversion=$(cat go.mod | grep "go 1." | sed 's/^go 1\.\(.*\)$/1.\1/')
-    fi
-
-    # when running inside a privileged container, snapd fails because udevd isn't
-    # running, but on the second occurance it is.
-    # see: https://github.com/lxc/lxd/issues/4308
-    sudo snap refresh go --channel=${goversion}/stable --classic 2> /dev/null || sudo snap install go --channel=${goversion}/stable --classic
-
-    if [ -f Makefile ]; then
-      make check
-    else
-      set +e -o pipefail # don't exit immediately, let go2xunit find failures, but do record if go test fails
-      go test -v ./... --check.v | tee ${WORKSPACE}/go-unittest.out
-    fi
-    check_exit=$?
+    sleep 10
+  done
+fi
+if [ ! -z "${EXTRA_PACKAGES}" ]; then
+  echo "Installing packages ${EXTRA_PACKAGES}"
+  sudo DEBIAN_FRONTEND=noninteractive apt-get install -y $(echo ${EXTRA_PACKAGES} | sed "s/,/ /g")
+fi
+if [ ! -z "${EXTRA_SCRIPT}" ]; then
+  eval ${EXTRA_SCRIPT}
+fi
 
+if [ -f Makefile ]; then
+  make check
+else
+  set +e -o pipefail # don't exit immediately, let go2xunit find failures, but do record if go test fails
+  go test -v ./... --check.v | tee ${WORKSPACE}/go-unittest.out
+fi
+check_exit=$?