Allow testing multiple etcd releases

Signed-off-by: Nont <[email protected]>

Author: Nont

.github/workflows/antithesis-test.yml

@@ -34,6 +34,11 @@ on:
         required: true
         type: string
         default: "etcd nightly antithesis run"
+      etcd_ref:
+        description: 'etcd version to build etcd-server from'
+        required: false
+        type: string
+        default: 'release-3.5'
       email:
         description: 'Additional email notification recipient (separate with ;)'
         required: true
@@ -85,7 +90,7 @@ jobs:
       - name: Build and push etcd image
         working-directory: ./tests/antithesis
         run: |
-          make antithesis-build-etcd-image
+          make antithesis-build-etcd-image-${{ inputs.etcd_ref }}
           export TAG="${{ env.REGISTRY }}/${{ env.REPOSITORY }}/etcd-server:latest"
           docker tag etcd-server:latest $TAG
           docker push $TAG

tests/antithesis/Makefile

@@ -2,34 +2,44 @@ REPOSITORY_ROOT := $(shell git rev-parse --show-toplevel)
 USER_ID := $(shell id -u)
 GROUP_ID := $(shell id -g)
 ARCH ?= $(shell go env GOARCH)
+REF = HEAD
+DOCKERFILE = ./Dockerfile
 
 .PHONY: antithesis-build-client-docker-image
 antithesis-build-client-docker-image:
 	docker build --build-arg GO_VERSION=$(shell cat $(REPOSITORY_ROOT)/.go-version) -f $(REPOSITORY_ROOT)/tests/antithesis/test-template/Dockerfile $(REPOSITORY_ROOT) -t etcd-client:latest
 
 .PHONY: antithesis-build-etcd-image
 antithesis-build-etcd-image:
-	git fetch origin release-3.5
-	git worktree remove -f /tmp/etcd3.5 || true
-	git worktree add /tmp/etcd3.5 origin/release-3.5
-	cd /tmp/etcd3.5 && make build
-	cd /tmp/etcd3.5 && cp ./Dockerfile-release.$(ARCH) ./bin/Dockerfile
-	cd /tmp/etcd3.5 && docker build \
+	git worktree remove -f /tmp/etcd$(REF) || true
+	git worktree add /tmp/etcd$(REF) $(REF)
+	cd /tmp/etcd$(REF); make build
+	cd /tmp/etcd$(REF); cp $(DOCKERFILE) ./bin/Dockerfile
+	cd /tmp/etcd$(REF); docker build \
 		--tag etcd-server:latest \
 		./bin
-	git worktree remove -f /tmp/etcd3.5
+	git worktree remove -f /tmp/etcd$(REF)
+
+.PHONY: antithesis-build-etcd-image-release-3.4
+antithesis-build-etcd-image-release-3.4: set-version-3.4 antithesis-build-etcd-image
+
+.PHONY: antithesis-build-etcd-image-release-3.5
+antithesis-build-etcd-image-release-3.5: set-version-3.5 antithesis-build-etcd-image
+
+.PHONY: antithesis-build-etcd-image-release-3.6
+antithesis-build-etcd-image-release-3.6: set-version-3.6 antithesis-build-etcd-image
 
 .PHONY: antithesis-docker-compose-up
 antithesis-docker-compose-up:
-	export USER_ID=$(USER_ID) && export GROUP_ID=$(GROUP_ID) && docker-compose up
+	export USER_ID=$(USER_ID); export GROUP_ID=$(GROUP_ID); export VERSION=$(REF); docker-compose up
 
 .PHONY: antithesis-run-container-traffic
 antithesis-run-container-traffic:
-	export USER_ID=$(USER_ID) && export GROUP_ID=$(GROUP_ID) && docker-compose exec client /opt/antithesis/test/v1/robustness/singleton_driver_traffic
+	export USER_ID=$(USER_ID); export GROUP_ID=$(GROUP_ID); docker-compose exec client /opt/antithesis/test/v1/robustness/singleton_driver_traffic
 
 .PHONY: antithesis-run-container-validation
 antithesis-run-container-validation:
-	export USER_ID=$(USER_ID) && export GROUP_ID=$(GROUP_ID) && docker-compose exec client /opt/antithesis/test/v1/robustness/finally_validation
+	export USER_ID=$(USER_ID); export GROUP_ID=$(GROUP_ID); docker-compose exec client /opt/antithesis/test/v1/robustness/finally_validation
 
 .PHONY: antithesis-run-local-traffic
 antithesis-run-local-traffic:
@@ -41,5 +51,20 @@ antithesis-run-local-validation:
 
 .PHONY: antithesis-clean
 antithesis-clean:
-	export USER_ID=$(USER_ID) && export GROUP_ID=$(GROUP_ID) && docker-compose down
+	export USER_ID=$(USER_ID); export GROUP_ID=$(GROUP_ID); docker-compose down
 	rm -rf /tmp/etcddata0 /tmp/etcddata1 /tmp/etcddata2 /tmp/etcdreport
+
+.PHONY: set-version-3.4
+set-version-3.4:
+	$(eval REF=release-3.4)
+	$(eval DOCKERFILE=./Dockerfile-release)
+
+.PHONY: set-version-3.5
+set-version-3.5:
+	$(eval REF=releas-3.5)
+	$(eval DOCKERFILE=./Dockerfile-release.amd64)
+
+.PHONY: set-version-3.6
+set-version-3.6:
+	$(eval REF=release-3.6)
+	$(eval DOCKERFILE=./Dockerfile)

tests/antithesis/README.md

@@ -11,6 +11,14 @@ make antithesis-build-client-docker-image
 make antithesis-build-etcd-image
 ```
 
+Both commands build etcd-server and etcd-client from the current branch. To build a different version of etcd you can use:
+
+```bash
+make antithesis-build-etcd-image REF=${YOUR_GIT_REF_OR_BRANCH} DOCKERFILE=${PATH_TO_etcd_DOCKERFILE}
+```
+
+By default, REF is set to `HEAD` and DOCKERFILE is `./Dockerfile`. The etcd Dockerfile location might not be at the same location or have the same name (for example, compare its location `release-3.4` between `release-3.5`). If the file location or name is different than the default in the target ref or branch, change it accordingly.
+
 ### 2. (Optional) Check the Image Locally
 
 You can verify your new image is built:
@@ -33,6 +41,8 @@ Run the following command from the root directory for Antithesis tests (`tests/a
 make antithesis-docker-compose-up
 ```
 
+The command uses the etcd client and server images built from step 1.
+
 The client will continuously check the health of the etcd nodes and print logs similar to:
 
 ```