handle docker-compose v2, free up more space

.github/workflows/tests.yaml

@@ -92,6 +92,7 @@ jobs:
       # Related to https://github.com/sigstore/cosign/issues/3149
       - name: free up disk space
         run: |
+          rm -rf /opt/hostedtoolcache/CodeQL
           rm -rf /usr/share/dotnet/
           rm -rf "$AGENT_TOOLSDIRECTORY"
           rm -rf "/usr/local/share/boost"
@@ -135,6 +136,7 @@ jobs:
             php-igbinary php-memcache php-memcached php-mongodb php-redis php-xdebug \
             php-zmq snmp pollinate libpq-dev postgresql-client powershell ruby-full \
             sphinxsearch subversion mongodb-org -yq >/dev/null 2>&1 || true
+          apt-get remove -y '^llvm.*' || true
           apt-get remove -y 'php.*' || true
           apt-get autoremove -y >/dev/null 2>&1 || true
           apt-get autoclean -y >/dev/null 2>&1 || true

.github/workflows/validate-release.yml

@@ -64,6 +64,8 @@ jobs:
       # Related to https://github.com/sigstore/cosign/issues/3149
       - name: free up disk space for the release
         run: |
+          rm -rf /usr/lib/google-cloud-sdk
+          rm -rf /opt/hostedtoolcache/CodeQL
           rm -rf /usr/share/dotnet/
           rm -rf "$AGENT_TOOLSDIRECTORY"
           rm -rf "/usr/local/share/boost"
@@ -108,6 +110,8 @@ jobs:
             php-zmq snmp pollinate libpq-dev postgresql-client powershell ruby-full \
             sphinxsearch subversion mongodb-org -yq >/dev/null 2>&1 || true
           apt-get remove -y 'php.*' || true
+          cd /usr/lib && du -sch * .[!.]* | sort -rh
+          cd /usr/lib/local && du -sch * .[!.]* | sort -rh
           apt-get autoremove -y >/dev/null 2>&1 || true
           apt-get autoclean -y >/dev/null 2>&1 || true
       - name: check disk space

test/e2e_test.sh

@@ -16,6 +16,11 @@
 
 set -ex
 
+docker_compose="docker compose"
+if ! ${docker_compose} version >/dev/null 2>&1; then
+    docker_compose="docker-compose"
+fi
+
 echo "setting up OIDC provider"
 pushd ./test/fakeoidc
 oidcimg=$(ko build main.go --local)
@@ -59,10 +64,15 @@ export FULCIO_METRICS_PORT=2113
 export FULCIO_CONFIG=/tmp/fulcio-config.json
 for repo in rekor fulcio; do
     pushd $repo
-    docker-compose up -d
+    if [ "$repo" == "fulcio" ]; then
+       yq -i e '.networks={"fulcio_default":{ "name":"fulcio_default","external":true }}' docker-compose.yml
+       yq -i e '.services.fulcio-server.networks=["fulcio_default"]' docker-compose.yml
+       tail docker-compose.yml
+    fi
+    ${docker_compose} up -d
     echo -n "waiting up to 60 sec for system to start"
     count=0
-    until [ $(docker-compose ps | grep -c "(healthy)") == 3 ];
+    until [ $(${docker_compose} ps | grep -c "(healthy)") == 3 ];
     do
         if [ $count -eq 6 ]; then
            echo "! timeout reached"
@@ -80,7 +90,7 @@ cleanup_services() {
     cleanup_oidc
     for repo in rekor fulcio; do
         pushd $HOME/$repo
-        docker-compose down
+        ${docker_compose} down
         popd
     done
 }