Merge pull request #90 from rajatjindal/use-spin-build

Run tests with spin-registry-push as well

Author: Mossaka

.github/workflows/ci.yaml

@@ -44,6 +44,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
       - uses: azure/setup-kubectl@v4
+      - uses: fermyon/actions/spin/setup@v1
+        with:
+          version: "v2.4.2"
+
       - name: Setup build env
         run: |
           ./scripts/setup-linux.sh

Makefile

@@ -34,22 +34,39 @@ move-bins:
 up:
 	./scripts/up.sh
 
+./PHONY: teardown-workloads
+teardown-workloads:
+	./scripts/teardown-workloads.sh
+
 ./PHONY: pod-status-check
 pod-status-check:
 	./scripts/pod-status-check.sh
 
-./PHONY: workloads
-workloads:
-	./scripts/workloads.sh
+./PHONY: deploy-workloads-pushed-using-docker-build-push
+deploy-workloads-pushed-using-docker-build-push:
+	./scripts/deploy-workloads.sh "workloads-pushed-using-docker-build-push"
+
+./PHONY: deploy-workloads-pushed-using-spin-registry-push
+deploy-workloads-pushed-using-spin-registry-push:
+	./scripts/deploy-workloads.sh "workloads-pushed-using-spin-registry-push"
 
-./PHONY: test-workloads-delete
-test-workloads-delete:
-	./scripts/workloads-delete.sh
+./PHONY: pod-terminates-test
+pod-terminates-test:
+	./scripts/pod-terminates-test.sh
 
 .PHONY: integration-tests
-integration-tests: check-bins move-bins up pod-status-check workloads test-workloads-delete
-	cargo test -p containerd-shim-spin-tests -- --nocapture
+integration-tests: prepare-cluster-and-images integration-docker-build-push-tests integration-spin-registry-push-tests
+
+.PHONY: integration-docker-build-push-tests
+integration-docker-build-push-tests:
+	./scripts/run-integration-tests.sh "workloads-pushed-using-docker-build-push"
+
+.PHONY: integration-spin-registry-push-tests pod-terminates-test
+integration-spin-registry-push-tests:
+	./scripts/run-integration-tests.sh "workloads-pushed-using-spin-registry-push"
 
+.PHONY: prepare-cluster-and-images
+prepare-cluster-and-images: check-bins move-bins up pod-status-check
 .PHONY: tests/collect-debug-logs
 tests/collect-debug-logs:
 	./scripts/collect-debug-logs.sh 2>&1

images/spin-inbound-redis/Cargo.lock

@@ -4,5 +4,5 @@ COPY . .
 RUN rustup target add wasm32-wasi && cargo build --target wasm32-wasi --release
 
 FROM scratch
-COPY --from=build /opt/build/target/wasm32-wasi/release/spin_inbound_redis.wasm .
+COPY --from=build /opt/build/target/wasm32-wasi/release/spin_inbound_redis.wasm ./target/wasm32-wasi/release/spin_inbound_redis.wasm
 COPY --from=build /opt/build/spin.toml .

images/spin-inbound-redis/Dockerfile

@@ -14,9 +14,12 @@ address = "{{ redis_address }}"
 component = "hello"
 
 [component.hello]
-source = "spin_inbound_redis.wasm"
+source = "target/wasm32-wasi/release/spin_inbound_redis.wasm"
 allowed_outbound_hosts = ["redis://*:*"]
 
+[component.hello.build]
+command = "cargo build --target wasm32-wasi --release"
+
 [component.hello.variables]
 redis_address = "{{ redis_address }}"
 redis_channel = "{{ redis_channel }}"

images/spin-inbound-redis/spin.toml

@@ -10,6 +10,6 @@ WORKDIR /opt/build/spin-redis-trigger
 RUN cargo build --target wasm32-wasi --release
 
 FROM scratch
-COPY --from=build /opt/build/spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm .
-COPY --from=build /opt/build/spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm .
+COPY --from=build /opt/build/spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm
+COPY --from=build /opt/build/spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm
 COPY --from=build /opt/build/spin.toml .

images/spin-multi-trigger-app/Dockerfile

@@ -11,10 +11,10 @@ route = "/..."
 component = "spin-http-trigger"
 
 [component.spin-http-trigger]
-source = "spin_http_trigger.wasm"
+source = "spin-http-trigger/target/wasm32-wasi/release/spin_http_trigger.wasm"
 allowed_outbound_hosts = []
 [component.spin-http-trigger.build]
-command = "cargo build --target wasm32-wasi --release"
+command = "cargo build --target wasm32-wasi --release --manifest-path spin-http-trigger/Cargo.toml"
 watch = ["src/**/*.rs", "Cargo.toml"]
 
 [application.trigger.redis]
@@ -25,7 +25,7 @@ channel = "testchannel"
 component = "spin-redis-trigger"
 
 [component.spin-redis-trigger]
-source = "spin_redis_trigger.wasm"
+source = "spin-redis-trigger/target/wasm32-wasi/release/spin_redis_trigger.wasm"
 allowed_outbound_hosts = ["redis://redis-service.default.svc.cluster.local:6379"]
 [component.spin-redis-trigger.build]
-command = "cargo build --target wasm32-wasi --release"
+command = "cargo build --target wasm32-wasi --release --manifest-path spin-redis-trigger/Cargo.toml"