try again

Signed-off-by: Bob Callaway <[email protected]>

.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 /usr/local/lib/android/
           rm -rf /usr/share/dotnet/
           rm -rf "$AGENT_TOOLSDIRECTORY"
           rm -rf "/usr/local/share/boost"
@@ -136,7 +137,6 @@ 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 '^llvm.*' || true
-          apt-get remove -y '^dotnet.*' || 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,7 @@ jobs:
       # Related to https://github.com/sigstore/cosign/issues/3149
       - name: free up disk space for the release
         run: |
+          rm -rf /usr/local/lib/android/
           rm -rf /usr/share/dotnet/
           rm -rf "$AGENT_TOOLSDIRECTORY"
           rm -rf "/usr/local/share/boost"
@@ -107,7 +108,6 @@ 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 '^dotnet.*' || 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

test/e2e_test.sh

@@ -24,7 +24,7 @@ fi
 echo "setting up OIDC provider"
 pushd ./test/fakeoidc
 oidcimg=$(ko build main.go --local)
-docker network ls | grep fulcio_default || docker network create fulcio_default --label "com.docker.compose.network=fulcio_default,com.docker.compose.project=fulcio"
+docker network ls | grep fulcio_default || docker network create fulcio_default
 docker run -d --rm -p 8080:8080 --network fulcio_default --name fakeoidc $oidcimg
 cleanup_oidc() {
     echo "cleaning up oidc"
@@ -64,6 +64,9 @@ export FULCIO_METRICS_PORT=2113
 export FULCIO_CONFIG=/tmp/fulcio-config.json
 for repo in rekor fulcio; do
     pushd $repo
+    if [ "$repo" == "fulcio" ]; then
+       yq -y '.networks={"fulcio_default":{ "name":"fulcio_default","external":true }}' docker-compose.yml | sponge docker-compose.yml
+    fi
     ${docker_compose} up -d
     echo -n "waiting up to 60 sec for system to start"
     count=0