Update to tip of sony/nmos-cpp master (#20)

* Added RDMA Core Userspace Libraries and Daemons to support NVIDIA Mellanox VFs * Merge latest nmos-cpp commit to support Avahi unicast fixes * Update to latest nmos-cpp commit to support discovery_mode functionality * Update container to latest Sony commit to support JT-NM Testing * Update to tip of sony/nmos-cpp master * Limit buildx on all platforms to master and dev * Default docker image name to 'rhastie/nmos-cpp' Co-authored-by: Richard Hastie <[email protected]>
rhastie · Dec 5, 2022 · 3cb53ee · 3cb53ee
1 parent 581408f
commit 3cb53ee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/ci-build-test-publish.yml b/.github/workflows/ci-build-test-publish.yml
@@ -32,6 +32,16 @@ jobs:
           echo "BUILD_NAME=ubuntu-latest_avahi" >> $GITHUB_ENV
           echo "TEST_FAIL=FALSE" >> $GITHUB_ENV
 
+
+      - name: Set docker image name
+        shell: bash
+        run: |
+          if [[ "${{ secrets.Docker_Image_Name }}" ]]; then 
+            echo "DOCKER_IMAGE_NAME=${{ secrets.Docker_Image_Name }}" >> $GITHUB_ENV
+          else
+            echo "DOCKER_IMAGE_NAME=rhastie/nmos-cpp" >> $GITHUB_ENV
+          fi
+
       - name: Set platforms and tags
         shell: bash
         run: |
@@ -72,7 +82,7 @@ jobs:
           dockerfile: Dockerfile
           publish: false
           load: true
-          imageName: ${{ secrets.Docker_Image_Name }}
+          imageName: ${{ env.DOCKER_IMAGE_NAME }}
           tag: ${{ env.GITHUB_BRANCH }}
           buildArg: makemt=3
           platform: linux/amd64
@@ -110,7 +120,7 @@ jobs:
 
       - name: Start Node Docker container for Node tests
         working-directory: ${{ env.RUNNER_WORKSPACE }}
-        run: docker run -it -d --net=host --name nmos-cpp-node -v="$(pwd)/node.json:/home/node.json" -e "RUN_NODE=TRUE" ${{ secrets.Docker_Image_Name }}:${{ env.GITHUB_BRANCH }}
+        run: docker run -it -d --net=host --name nmos-cpp-node -v="$(pwd)/node.json:/home/node.json" -e "RUN_NODE=TRUE" ${{ env.DOCKER_IMAGE_NAME }}:${{ env.GITHUB_BRANCH }}
 
       - name: Install AMWA Test suite
         shell: bash
@@ -186,9 +196,9 @@ jobs:
         run: |
           docker container stop nmos-cpp-node
           docker container rm nmos-cpp-node
-          docker run -it -d --net=host --name nmos-cpp-registry -v="$(pwd)/registry.json:/home/registry.json" -e "RUN_NODE=FALSE" ${{ secrets.Docker_Image_Name }}:${{ env.GITHUB_BRANCH }}
+          docker run -it -d --net=host --name nmos-cpp-registry -v="$(pwd)/registry.json:/home/registry.json" -e "RUN_NODE=FALSE" ${{ env.DOCKER_IMAGE_NAME }}:${{ env.GITHUB_BRANCH }}
           sleep 5
-          docker run -it -d --net=host --name nmos-cpp-node -v="$(pwd)/node.json:/home/node.json" -e "RUN_NODE=TRUE" ${{ secrets.Docker_Image_Name }}:${{ env.GITHUB_BRANCH }}
+          docker run -it -d --net=host --name nmos-cpp-node -v="$(pwd)/node.json:/home/node.json" -e "RUN_NODE=TRUE" ${{ env.DOCKER_IMAGE_NAME }}:${{ env.GITHUB_BRANCH }}
 
       - name: Run AMWA Test suite against Registry
         shell: bash
@@ -284,20 +294,21 @@ jobs:
           ip address
 
       - name: If Passes tests, Docker Buildx and publish x86 image to Docker Hub
-        if: env.TEST_FAIL == 'FALSE'
+        if: env.TEST_FAIL == 'FALSE' && (env.GITHUB_BRANCH == 'master' || env.GITHUB_BRANCH == 'dev')
         uses: ilteoood/docker_buildx@master
         with:
           dockerfile: Dockerfile
           publish: true
           load: false
-          imageName: ${{ secrets.Docker_Image_Name }}
+          imageName: ${{ env.DOCKER_IMAGE_NAME }}
           tag: ${{ env.BUILD_TAGS }}
           buildArg: makemt=3
           platform: ${{ env.BUILD_PLATFORMS }}
           dockerUser: ${{ secrets.DockerHub_User }}
           dockerPassword: ${{ secrets.DockerHub_Password }}
 
       - name: Upload results to google sheets
+        if: env.TEST_FAIL == 'FALSE' && (env.GITHUB_BRANCH == 'master' || env.GITHUB_BRANCH == 'dev')
         working-directory: ${{ env.RUNNER_WORKSPACE }}
         shell: bash
         run: |
@@ -312,7 +323,7 @@ jobs:
       #   with:
       #     user: ${{ secrets.DockerHub_User }}
       #     pass: ${{ secrets.DockerHub_Password }}
-      #     slug: ${{ secrets.Docker_Image_Name }}
+      #     slug: ${{ env.DOCKER_IMAGE_NAME }}
 
       - name: If Passes tests, build image file of x86 container
         if: env.TEST_FAIL == 'FALSE'
@@ -322,7 +333,7 @@ jobs:
           # Make directory and build image from container in Docker image repository
           mkdir container-image
           cd container-image
-          docker save ${{ secrets.Docker_Image_Name }}:${{ env.GITHUB_BRANCH }}| gzip > nmos-cpp_${{ env.GITHUB_BRANCH }}-${{ env.GITHUB_COMMIT }}.img.tar.gz
+          docker save ${{ env.DOCKER_IMAGE_NAME }}:${{ env.GITHUB_BRANCH }}| gzip > nmos-cpp_${{ env.GITHUB_BRANCH }}-${{ env.GITHUB_COMMIT }}.img.tar.gz
 
       - name: If Passes tests, upload container image as an artifact
         if: env.TEST_FAIL == 'FALSE'

diff --git a/Dockerfile b/Dockerfile
@@ -26,8 +26,9 @@ RUN cd /home && mkdir certs && git config --global http.sslVerify false && \
     mv /home/nmos-testing/test_data/BCP00301/ca/* /home/certs && \
     rm -rf /home/nmos-testing
 
-## Get source for Sony nmos-cpp/
-ENV NMOS_CPP_VERSION=3a904a3fcc39057a8db74656a697f0d97d8a3651
+## Get source for Sony nmos-cpp
+## Commit 0fb6b51 corresponds to Conan package nmos-cpp/cci.20221203
+ENV NMOS_CPP_VERSION=0fb6b51737f737ae011cbcc39cdfb2c5236ec59f
 RUN cd /home/ && curl --output - -s -k https://codeload.github.com/sony/nmos-cpp/tar.gz/$NMOS_CPP_VERSION | tar zxvf - -C . && \
     mv ./nmos-cpp-${NMOS_CPP_VERSION} ./nmos-cpp