Merge pull request #122 from orelmisan/build_system_rm_traffic_gen

[traffic-gen-in-vm] Build system: remove traffic-gen pod
kiagnose · Jul 11, 2023 · 14cf465 · 14cf465
2 parents 5ec7133 + f750a24
commit 14cf465
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 356 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -48,11 +48,3 @@ jobs:
         uses: actions/checkout@v3
       - name: Build checkup image
         run: make build
-  build-traffic-gen:
-    name: Build traffic generator image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-      - name: Build traffic generator image
-        run: make build-traffic-gen
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -26,9 +26,5 @@ jobs:
           ${CRI_BIN} login -u ${{ secrets.QUAY_USER }} -p ${{ secrets.QUAY_TOKEN }} quay.io
       - name: Build checkup image
         run: make build
-      - name: Build traffic-gen image
-        run: make build-traffic-gen
       - name: Push checkup image
         run: make push
-      - name: Push traffic-gen image
-        run: make push-traffic-gen
diff --git a/Makefile b/Makefile
@@ -3,9 +3,6 @@ ORG ?= kiagnose
 CHECKUP_IMAGE_NAME ?= kubevirt-dpdk-checkup
 CHECKUP_IMAGE_TAG ?= latest
 CHECKUP_GIT_TAG ?= $(shell git describe --always --abbrev=8 --tags)
-TRAFFIC_GEN_IMAGE_NAME ?= kubevirt-dpdk-checkup-traffic-gen
-TRAFFIC_GEN_IMAGE_TAG ?= latest
-TRAFFIC_GEN_GIT_TAG ?= $(CHECKUP_GIT_TAG)
 VM_IMAGE_BUILDER_IMAGE_NAME := kubevirt-dpdk-checkup-vm-image-builder
 VM_IMAGE_BUILDER_IMAGE_TAG ?= latest
 VIRT_BUILDER_CACHE_DIR := $(CURDIR)/_virt_builder/cache
@@ -98,16 +95,6 @@ vendor:
 	           $(GO_IMAGE_NAME):$(GO_IMAGE_TAG) go mod tidy -compat=$(GO_MOD_VERSION) && go mod vendor
 .PHONY: vendor
 
-build-traffic-gen:
-	$(CRI_BIN) build -f traffic-gen/Dockerfile -t $(REG)/$(ORG)/$(TRAFFIC_GEN_IMAGE_NAME):$(TRAFFIC_GEN_IMAGE_TAG) traffic-gen
-.PHONY: build-traffic-gen
-
-push-traffic-gen:
-	$(CRI_BIN) push $(REG)/$(ORG)/$(TRAFFIC_GEN_IMAGE_NAME):$(TRAFFIC_GEN_IMAGE_TAG)
-	$(CRI_BIN) tag $(REG)/$(ORG)/$(TRAFFIC_GEN_IMAGE_NAME):$(TRAFFIC_GEN_IMAGE_TAG) $(REG)/$(ORG)/$(TRAFFIC_GEN_IMAGE_NAME):$(TRAFFIC_GEN_GIT_TAG)
-	$(CRI_BIN) push $(REG)/$(ORG)/$(TRAFFIC_GEN_IMAGE_NAME):$(TRAFFIC_GEN_GIT_TAG)
-.PHONY: push-traffic-gen
-
 build-vm-image-builder:
 	$(CRI_BIN) build $(CURDIR)/vm/image-builder -f $(CURDIR)/vm/image-builder/Dockerfile -t $(REG)/$(ORG)/$(VM_IMAGE_BUILDER_IMAGE_NAME):$(VM_IMAGE_BUILDER_IMAGE_TAG)
 .PHONY: build-vm-image-builder

diff --git a/traffic-gen/Dockerfile b/traffic-gen/Dockerfile
diff --git a/traffic-gen/scripts/main.sh b/traffic-gen/scripts/main.sh
diff --git a/traffic-gen/scripts/run_traffic_gen_daemon.sh b/traffic-gen/scripts/run_traffic_gen_daemon.sh
diff --git a/traffic-gen/scripts/set_tests_files.sh b/traffic-gen/scripts/set_tests_files.sh
diff --git a/traffic-gen/scripts/set_traffic_gen_cfg_file.sh b/traffic-gen/scripts/set_traffic_gen_cfg_file.sh
diff --git a/traffic-gen/templates/testpmd.py.in b/traffic-gen/templates/testpmd.py.in
diff --git a/traffic-gen/templates/testpmd_addr.py.in b/traffic-gen/templates/testpmd_addr.py.in
diff --git a/traffic-gen/templates/trex_cfg.yaml.in b/traffic-gen/templates/trex_cfg.yaml.in