diff --git a/.github/workflows/validate-stacks.yaml b/.github/workflows/validate-stacks.yaml index 1a614d49..2a921152 100644 --- a/.github/workflows/validate-stacks.yaml +++ b/.github/workflows/validate-stacks.yaml @@ -29,6 +29,7 @@ concurrency: env: MINIKUBE_VERSION: "v1.29.0" + MINIKUBE_RESOURCES: "--memory 14gb --cpus 4" KUBERNETES_VERSION: "v1.25.2" TEST_DELTA: false @@ -73,7 +74,7 @@ jobs: kubernetes version: ${{ env.KUBERNETES_VERSION }} driver: "docker" github token: ${{ secrets.GITHUB_TOKEN }} - start args: "--addons=ingress" + start args: "--addons=ingress ${{ env.MINIKUBE_RESOURCES }}" - name: Test delta if on a pull request if: ${{ github.event_name == 'pull_request' }} @@ -90,6 +91,17 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 + + - name: Free Disk Space + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be #v1.3.1 + with: + tool-cache: false + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true - name: Setup Minikube uses: manusa/actions-setup-minikube@e2f60d2f9e42413a916781a805284e79ccabaf54 # v2.10.0 @@ -98,7 +110,7 @@ jobs: kubernetes version: ${{ env.KUBERNETES_VERSION }} driver: "docker" github token: ${{ secrets.GITHUB_TOKEN }} - start args: "--addons=ingress" + start args: "--addons=ingress ${{ env.MINIKUBE_RESOURCES }}" - name: Install odo v2 uses: redhat-actions/openshift-tools-installer@2de9a80cf012ad0601021515481d433b91ef8fd5 # v1 @@ -118,12 +130,25 @@ jobs: odov3: name: with odo v3 runs-on: ubuntu-latest + needs: [odov2, non-terminating, validate-devfile-schema] + if: success() || failure() steps: - name: Checkout uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 + - name: Free Disk Space + uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be #v1.3.1 + with: + tool-cache: false + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + - name: Setup Minikube uses: manusa/actions-setup-minikube@e2f60d2f9e42413a916781a805284e79ccabaf54 # v2.10.0 with: @@ -131,7 +156,7 @@ jobs: kubernetes version: ${{ env.KUBERNETES_VERSION }} driver: "docker" github token: ${{ secrets.GITHUB_TOKEN }} - start args: "--addons=ingress" + start args: "--addons=ingress ${{ env.MINIKUBE_RESOURCES }}" - name: Install Go uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 diff --git a/tests/check_odov2.sh b/tests/check_odov2.sh index 2ba266db..9df8cc98 100755 --- a/tests/check_odov2.sh +++ b/tests/check_odov2.sh @@ -206,7 +206,7 @@ for stack in $STACKS; do # Skipping the java-wildfly-bootable-jar stack right now since it's broken. # TODO: Uncomment once fixed. - if [ $stack != "java-wildfly-bootable-jar" ]; then + if [[ $stack != "java-wildfly-bootable-jar" && $stack != "java-quarkus/1.3.0" && $stack != "java-quarkus/1.4.0" ]]; then test "$devfile_name" "$devfile_version" "$devfile_path" fi done diff --git a/tests/check_odov3.sh b/tests/check_odov3.sh index dbb1703a..09facdf6 100755 --- a/tests/check_odov3.sh +++ b/tests/check_odov3.sh @@ -39,6 +39,8 @@ ginkgo run --procs 2 \ --skip="stack: java-wildfly" \ --skip="stack: java-openliberty" \ --skip="stack: java-websphereliberty" \ + --skip="stack: java-quarkus version: 1.3.0 starter: community" \ + --skip="stack: java-quarkus version: 1.4.0 starter: community" \ --slow-spec-threshold 120s \ - --timeout 2h \ + --timeout 3h \ tests/odov3 -- -stacksPath "$(pwd)"/stacks -stackDirs "$stackDirs" diff --git a/tests/odov3/odo_test.go b/tests/odov3/odo_test.go index 6e5aa63f..4f59a901 100644 --- a/tests/odov3/odo_test.go +++ b/tests/odov3/odo_test.go @@ -315,7 +315,7 @@ func waitForHttp(url string, expectedCode int) error { func waitForPort(devError chan error) ([]ForwardedPort, error) { args := []string{"describe", "component", "-o", "json"} - maxTries := 20 + maxTries := 50 delay := 10 * time.Second stdout := []byte{}