Merge pull request #147 from cloudfoundry/fix-e2e

Fix e2e

Author: nicolasbender

.github/workflows/e2e.yml

@@ -1,9 +1,10 @@
 name: E2E Tests on KinD
 
 on:
+  pull_request:
+    branches: ["main"]
   push:
-    branches:
-      - main
+    branches: ["main"]
   workflow_dispatch:
 
 jobs:
@@ -59,7 +60,13 @@ jobs:
           default/$(kubectl get pod -n default -l app.kubernetes.io/name=fileserver \
           -o jsonpath='{.items[0].metadata.name}'):fileserver/v1/static/cnb_app_lifecycle/cnb_app_lifecycle.tgz
       - name: Run E2E tests for java
-        run: cf push hello-java -f examples/hello-java/manifest.yaml
+        run: |
+          cf push hello-java -f examples/hello-java/manifest.yaml
+          curl -s -f hello-java.apps.127-0-0-1.nip.io | grep -F "Hello World"
+          cf delete hello-java -f -r
       - name: Run E2E tests for nodejs
-        run: cf push hello-js -f examples/hello-js/manifest.yaml
-      
+        run: |
+          cf push hello-js -f examples/hello-js/manifest.yaml
+          curl -s -f hello-js.apps.127-0-0-1.nip.io | grep -F "Hello World"
+          cf delete hello-js -f -r
+      

examples/hello-java/src/main/java/org/cloudfoundry/demo/Application.java

@@ -5,9 +5,6 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @SpringBootApplication(proxyBeanMethods=false)
 @RestController
 public class Application {
@@ -16,19 +13,20 @@ public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
 
+	// CPU-intensive Fibonacci calculation
+	private long fib(int n) {
+		if (n <= 1) return n;
+		return fib(n - 1) + fib(n - 2);
+	}
+
 	@GetMapping("/")
-	public String fibonacci() {
-		List<Long> fibNumbers = new ArrayList<>();
-		long a = 0, b = 1;
+	public String index() {
+		String instanceIndex = System.getenv("CF_INSTANCE_INDEX");
 
-		for (int i = 0; i < 40; i++) {
-			fibNumbers.add(a);
-			long next = a + b;
-			a = b;
-			b = next;
-		}
+		// Do CPU-intensive work
+		long fibResult = fib(40);
+		System.out.println("Computed Fibonacci(40): " + fibResult);
 
-		return fibNumbers.toString();
+		return "Hello World! (CF_INSTANCE_INDEX: " + instanceIndex + ")\nFibonacci(40): " + fibResult + "\n";
 	}
-
 }