From 3df93cf04f1097a5264e100ba3e1b75af19ca3d0 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 8 Jun 2022 21:00:54 +0300 Subject: [PATCH] rename image dsa-accel-config-demo -> accel-config-demo --- .github/workflows/ci.yaml | 2 +- .github/workflows/e2e-dsa.yml | 2 +- cmd/dsa_plugin/README.md | 4 ++-- demo/{dsa-accel-config-demo => accel-config-demo}/Dockerfile | 0 .../idxd-reset.patch | 0 .../test_runner_disable_shared_queues.patch | 0 demo/dsa-accel-config-demo-pod.yaml | 2 +- demo/screencast-dsa-accel-config.sh | 2 +- scripts/set-version.sh | 4 ++-- 9 files changed, 8 insertions(+), 8 deletions(-) rename demo/{dsa-accel-config-demo => accel-config-demo}/Dockerfile (100%) rename demo/{dsa-accel-config-demo => accel-config-demo}/idxd-reset.patch (100%) rename demo/{dsa-accel-config-demo => accel-config-demo}/test_runner_disable_shared_queues.patch (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3c48f83d..41d78e55 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -115,7 +115,7 @@ jobs: # Demo images - crypto-perf - - dsa-accel-config-demo + - accel-config-demo - intel-opencl-icd - iaa-qpl-demo - opae-nlb-demo diff --git a/.github/workflows/e2e-dsa.yml b/.github/workflows/e2e-dsa.yml index 188360f6..64ee1009 100644 --- a/.github/workflows/e2e-dsa.yml +++ b/.github/workflows/e2e-dsa.yml @@ -9,7 +9,7 @@ on: - 'release-*' env: - IMAGES: 'intel-dsa-plugin intel-idxd-config-initcontainer dsa-accel-config-demo' + IMAGES: 'intel-dsa-plugin intel-idxd-config-initcontainer accel-config-demo' jobs: e2e-dsa: diff --git a/cmd/dsa_plugin/README.md b/cmd/dsa_plugin/README.md index 35e3a3c3..2b43f87d 100644 --- a/cmd/dsa_plugin/README.md +++ b/cmd/dsa_plugin/README.md @@ -152,9 +152,9 @@ We can test the plugin is working by deploying the provided example accel-config 1. Build a Docker image with an accel-config tests: ```bash - $ make dsa-accel-config-demo + $ make accel-config-demo ... - Successfully tagged dsa-accel-config-demo:devel + Successfully tagged accel-config-demo:devel ``` 1. Create a pod running unit tests off the local Docker image: diff --git a/demo/dsa-accel-config-demo/Dockerfile b/demo/accel-config-demo/Dockerfile similarity index 100% rename from demo/dsa-accel-config-demo/Dockerfile rename to demo/accel-config-demo/Dockerfile diff --git a/demo/dsa-accel-config-demo/idxd-reset.patch b/demo/accel-config-demo/idxd-reset.patch similarity index 100% rename from demo/dsa-accel-config-demo/idxd-reset.patch rename to demo/accel-config-demo/idxd-reset.patch diff --git a/demo/dsa-accel-config-demo/test_runner_disable_shared_queues.patch b/demo/accel-config-demo/test_runner_disable_shared_queues.patch similarity index 100% rename from demo/dsa-accel-config-demo/test_runner_disable_shared_queues.patch rename to demo/accel-config-demo/test_runner_disable_shared_queues.patch diff --git a/demo/dsa-accel-config-demo-pod.yaml b/demo/dsa-accel-config-demo-pod.yaml index d070019b..dcb1ef8f 100644 --- a/demo/dsa-accel-config-demo-pod.yaml +++ b/demo/dsa-accel-config-demo-pod.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: dsa-accel-config-demo - image: intel/dsa-accel-config-demo:devel + image: intel/accel-config-demo:devel imagePullPolicy: IfNotPresent resources: limits: diff --git a/demo/screencast-dsa-accel-config.sh b/demo/screencast-dsa-accel-config.sh index b810f28e..6f12e601 100755 --- a/demo/screencast-dsa-accel-config.sh +++ b/demo/screencast-dsa-accel-config.sh @@ -76,7 +76,7 @@ screen3() clear out 'Run test workload that uses DSA' command 'curl https://raw.githubusercontent.com/intel/intel-device-plugins-for-kubernetes/main/demo/dsa-accel-config-demo-pod.yaml' 100 - command 'curl https://raw.githubusercontent.com/intel/intel-device-plugins-for-kubernetes/main/demo/dsa-accel-config-demo/Dockerfile' 100 + command 'curl https://raw.githubusercontent.com/intel/intel-device-plugins-for-kubernetes/main/demo/accel-config-demo/Dockerfile' 100 command 'kubectl create -f https://raw.githubusercontent.com/intel/intel-device-plugins-for-kubernetes/main/demo/dsa-accel-config-demo-pod.yaml' 100 sleep 5 out 'Look at the workload output' diff --git a/scripts/set-version.sh b/scripts/set-version.sh index 947ddb8c..1e486b54 100755 --- a/scripts/set-version.sh +++ b/scripts/set-version.sh @@ -15,6 +15,6 @@ if [ $# != 1 ] || [ "$1" = "?" ] || [ "$1" = "--help" ]; then exit 1 fi -for file in $(git grep -l '^TAG?*=\|intel/dsa-accel-config-demo:\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/dlb-libdlb-demo:\|intel/intel-[^ ]*:\|version=\|appVersion:\|tag:' Makefile deployments demo/*dsa*.yaml demo/*fpga*.yaml pkg/controllers/*/*_test.go build/docker/*.Dockerfile charts test/e2e/*/*.go); do - sed -i -e "s;\(^TAG?*=\|intel/dsa-accel-config-demo:\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/dlb-libdlb-demo:\|intel/intel-[^ ]*:\|version=\|appVersion: [^ ]\|tag: [^ ]\)[^ \"]*;\1$1;g" "$file"; +for file in $(git grep -l '^TAG?*=\|intel/accel-config-demo:\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/dlb-libdlb-demo:\|intel/intel-[^ ]*:\|version=\|appVersion:\|tag:' Makefile deployments demo/*dsa*.yaml demo/*fpga*.yaml pkg/controllers/*/*_test.go build/docker/*.Dockerfile charts test/e2e/*/*.go); do + sed -i -e "s;\(^TAG?*=\|intel/accel-config-demo:\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/dlb-libdlb-demo:\|intel/intel-[^ ]*:\|version=\|appVersion: [^ ]\|tag: [^ ]\)[^ \"]*;\1$1;g" "$file"; done