From f596fc593fe349bc1635d0c3e7d89c62a959424c Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Wed, 4 Sep 2019 11:01:44 +0300 Subject: [PATCH] demo: rename clearlinux-demo-opae to opae-nlb-demo opae-nlb-demo name is more descriptive about the content and becomes base image agnostic. Also, set ENTRYPOINT similar to what we did with other images and deployment files. Signed-off-by: Mikko Ylinen --- demo/intelfpga-job.yaml | 3 +-- ...-in-containers-don-t-enumerate-missing-device.patch | 0 .../{clearlinux-demo-opae => opae-nlb-demo}/Dockerfile | 10 ++++++---- .../test_fpga.sh | 0 demo/screencast.sh | 8 ++++---- demo/{test-fpga-region.yml => test-fpga-region.yaml} | 3 +-- scripts/set-version.sh | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) rename demo/{clearlinux-demo-opae => opae-nlb-demo}/0001-OPAE-in-containers-don-t-enumerate-missing-device.patch (100%) rename demo/{clearlinux-demo-opae => opae-nlb-demo}/Dockerfile (83%) rename demo/{clearlinux-demo-opae => opae-nlb-demo}/test_fpga.sh (100%) rename demo/{test-fpga-region.yml => test-fpga-region.yaml} (81%) diff --git a/demo/intelfpga-job.yaml b/demo/intelfpga-job.yaml index 03b0d39d..88378466 100644 --- a/demo/intelfpga-job.yaml +++ b/demo/intelfpga-job.yaml @@ -13,9 +13,8 @@ spec: restartPolicy: Never containers: - name: intelfpga-demo-job-1 - image: clearlinux-demo-opae:devel + image: intel/opae-nlb-demo:devel imagePullPolicy: IfNotPresent - command: ["/usr/bin/test_fpga.sh"] securityContext: capabilities: add: diff --git a/demo/clearlinux-demo-opae/0001-OPAE-in-containers-don-t-enumerate-missing-device.patch b/demo/opae-nlb-demo/0001-OPAE-in-containers-don-t-enumerate-missing-device.patch similarity index 100% rename from demo/clearlinux-demo-opae/0001-OPAE-in-containers-don-t-enumerate-missing-device.patch rename to demo/opae-nlb-demo/0001-OPAE-in-containers-don-t-enumerate-missing-device.patch diff --git a/demo/clearlinux-demo-opae/Dockerfile b/demo/opae-nlb-demo/Dockerfile similarity index 83% rename from demo/clearlinux-demo-opae/Dockerfile rename to demo/opae-nlb-demo/Dockerfile index 0e9b89ca..3fcf0ab1 100644 --- a/demo/clearlinux-demo-opae/Dockerfile +++ b/demo/opae-nlb-demo/Dockerfile @@ -12,13 +12,14 @@ FROM ${CLEAR_LINUX_BASE} as builder ARG CLEAR_LINUX_VERSION= -RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} - +RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} && \ + swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc doxygen Sphinx patch # Fetch dependencies and source code ARG OPAE_RElEASE=1.3.2-1 -RUN swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc doxygen Sphinx patch && \ - mkdir -p /usr/src/opae && \ +# workaround for a swupd failure discussed in https://github.com/clearlinux/distribution/issues/831 +RUN ldconfig +RUN mkdir -p /usr/src/opae && \ cd /usr/src/opae && \ wget https://github.com/OPAE/opae-sdk/archive/${OPAE_RElEASE}.tar.gz && \ tar xf *.tar.gz @@ -51,3 +52,4 @@ COPY --from=builder /usr/src/opae/opae-sdk-*/build/bin/nlb* /usr/bin/ COPY --from=builder /usr/src/opae/opae-sdk-*/build/lib/lib*.so* /usr/lib64/ COPY test_fpga.sh /usr/bin/ +ENTRYPOINT ["/usr/bin/test_fpga.sh"] diff --git a/demo/clearlinux-demo-opae/test_fpga.sh b/demo/opae-nlb-demo/test_fpga.sh similarity index 100% rename from demo/clearlinux-demo-opae/test_fpga.sh rename to demo/opae-nlb-demo/test_fpga.sh diff --git a/demo/screencast.sh b/demo/screencast.sh index 7b0841b3..61dd59ac 100755 --- a/demo/screencast.sh +++ b/demo/screencast.sh @@ -125,16 +125,16 @@ screen5() clear cd $GOPATH/src/github.com/intel/intel-device-plugins-for-kubernetes out "5. Run OPAE workload that uses NLB3 bitstream" - out "Build clearlinux-demo-opae image:" - command "cd demo; ./build-image.sh clearlinux-demo-opae ; cd ../" 15 + out "Build opae-nlb-demo image:" + command "cd demo; ./build-image.sh opae-nlb-demo ; cd ../" 15 out "Import image from docker to CRI-O:" - command "docker save clearlinux-demo-opae:devel | sudo podman load" + command "docker save opae-nlb-demo:devel | sudo podman load" out "Program bitstream that is not wanted by the workload:" command "sudo /opt/intel/fpga-sw/opae/fpgaconf-wrapper -s0 /srv/intel.com/fpga/9926ab6d6c925a68aabca7d84c545738/d8424dc4a4a3c413f89e433683f9040b.gbs" out "Check if device is programmed with it:" command "cat /sys/class/fpga/intel-fpga-dev.0/intel-fpga-port.0/afu_id" out "Run workload:" - command "kubectl create -f demo/test-fpga-region.yml" + command "kubectl create -f demo/test-fpga-region.yaml" sleep 2 out "Look at the test output" command "kubectl logs test-fpga-region" diff --git a/demo/test-fpga-region.yml b/demo/test-fpga-region.yaml similarity index 81% rename from demo/test-fpga-region.yml rename to demo/test-fpga-region.yaml index fb69018b..c5a24744 100644 --- a/demo/test-fpga-region.yml +++ b/demo/test-fpga-region.yaml @@ -5,9 +5,8 @@ metadata: spec: containers: - name: test-container - image: clearlinux-demo-opae:devel + image: intel/opae-nlb-demo:devel imagePullPolicy: IfNotPresent - command: ["sh", "/usr/bin/test_fpga.sh"] securityContext: capabilities: add: diff --git a/scripts/set-version.sh b/scripts/set-version.sh index c1a9a63c..42b94b6e 100755 --- a/scripts/set-version.sh +++ b/scripts/set-version.sh @@ -15,4 +15,4 @@ if [ $# != 1 ] || [ "$1" = "?" ] || [ "$1" = "--help" ]; then exit 1 fi -sed -i -e "s;\(^TAG?*=\|intel/crypto-perf:\|intel/intel-[^ ]*:\)[^ ]*;\1$1;g" $(git grep -l '^TAG?*=\|intel/crypto-perf:\|intel/intel-[^ ]*:' Makefile deployments) +sed -i -e "s;\(^TAG?*=\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/intel-[^ ]*:\)[^ ]*;\1$1;g" $(git grep -l '^TAG?*=\|intel/crypto-perf:\|intel/opae-nlb-demo:\|intel/intel-[^ ]*:' Makefile deployments demo/*fpga*.yaml)