Pktvisor release 4.4.0 (#681)

netboxlabs · Jun 7, 2023 · ad17f1c · ad17f1c
2 parents 3fc9673 + 18764e5
commit ad17f1c
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 288 deletions.
diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml
@@ -27,7 +27,13 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v3
-
+      - name: install gcc 12.2
+        run: |  
+          gcc --version
+          brew search gcc
+          brew install gcc@12
+          gcc --version
+      
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands
@@ -39,35 +45,35 @@ jobs:
         with:
           version: 1.59.0
 
-      - name: Setup Conan Cache
-        uses: actions/cache@v3
-        with:
-          path: ${{github.workspace}}/build/conan_home/
-          key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
-          restore-keys: conan-${{ runner.os }}-
-
-      - name: Configure CMake
-        # Use a bash shell so we can use the same syntax for environment variable
-        # access regardless of the host operating system
-        shell: bash
-        working-directory: ${{github.workspace}}/build
-        # Note the current convention is to use the -S and -B options here to specify source
-        # and build directories, but this is only available with CMake 3.13 and higher.
-        # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-        run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-
-      - name: Build
-        working-directory: ${{github.workspace}}/build
-        shell: bash
-        # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: cmake --build . --config $BUILD_TYPE -- -j 2
-
-      - name: Test
-        working-directory: ${{github.workspace}}/build
-        shell: bash
-        # Execute tests defined by the CMake configuration.
-        # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-        run: ctest -C $BUILD_TYPE
+#       - name: Setup Conan Cache
+#         uses: actions/cache@v3
+#         with:
+#           path: ${{github.workspace}}/build/conan_home/
+#           key: conan-${{ runner.os }}-${{ hashFiles('conanfile.txt', '*/conanfile.txt') }}
+#           restore-keys: conan-${{ runner.os }}-
+
+#       - name: Configure CMake
+#         # Use a bash shell so we can use the same syntax for environment variable
+#         # access regardless of the host operating system
+#         shell: bash
+#         working-directory: ${{github.workspace}}/build
+#         # Note the current convention is to use the -S and -B options here to specify source
+#         # and build directories, but this is only available with CMake 3.13 and higher.
+#         # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
+#         run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+#       - name: Build
+#         working-directory: ${{github.workspace}}/build
+#         shell: bash
+#         # Execute the build.  You can specify a specific target with "--target <NAME>"
+#         run: cmake --build . --config $BUILD_TYPE -- -j 2
+
+#       - name: Test
+#         working-directory: ${{github.workspace}}/build
+#         shell: bash
+#         # Execute tests defined by the CMake configuration.
+#         # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+#         run: ctest -C $BUILD_TYPE
 
   unit-tests-linux:
     # The CMake configure and build commands are platform agnostic and should work equally
@@ -644,7 +650,7 @@ jobs:
           key: ${{ secrets.RUNNER_SSH_KEY }}
           port: 2022
           source: "./output/*"
-          target: "/usr/share/nginx/html/pktvisor/develop/${{ needs.integration-tests.outputs.commit_hash }}/pktvisor/python-test"
+          target: "/usr/share/nginx/html/test_data/pktvisor/develop/${{ needs.integration-tests.outputs.commit_hash }}/pktvisor/python-test"
 
   remove-github-runner-amd64:
     continue-on-error: true

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -20,7 +20,7 @@ jobs:
   unit-tests:
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-11 ]
+        os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -255,92 +255,6 @@ jobs:
           path: |
             .github/hosted-runner/arm64/terraform.tfstate
           retention-days: 1
-
-  spinup-amd64-runner:
-    needs: [ prebuild-package ]
-    runs-on: ubuntu-latest
-    outputs:
-      runner_token: ${{ steps.token.outputs.runner }}
-      runner_label: ${{ env.RUNNER_LABEL }}
-    if: github.event_name != 'pull_request'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Generate runner token
-        id: token
-        run: |
-          curl -X POST -H "authorization: Bearer ${{ secrets.BOT_TOKEN }}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/orb-community/pktvisor/actions/runners/registration-token -o token.json
-          echo "::set-output name=runner::$(cat token.json | jq .token --raw-output )"
-          cat token.json
-          
-      - name: Get short commit hash to a variable
-        id: commit_hash
-        run: |
-          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-
-      - name: Inject runner token in user_data.sh
-        run: |
-          cd .github/hosted-runner/amd64/
-          ESCAPED_REPLACE_RUNNER_TOKEN=$(printf '%s\n' "${{ steps.token.outputs.runner }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/RUNNER_TOKEN/$ESCAPED_REPLACE_RUNNER_TOKEN/g" user_data.sh
-          ESCAPED_REPLACE_RUNNER_NAME=$(printf '%s\n' "${{ steps.commit_hash.outputs.sha_short }}-amd64" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/AMD64_RUNNER/$ESCAPED_REPLACE_RUNNER_NAME/g" user_data.sh
-          ESCAPED_REPLACE_RUNNER_LABEL=$(printf '%s\n' "${{ steps.commit_hash.outputs.sha_short }}-amd64" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/RUNNER_LABEL/$ESCAPED_REPLACE_RUNNER_LABEL/g" user_data.sh
-          echo "RUNNER_LABEL=${{ steps.commit_hash.outputs.sha_short }}-amd64" >> $GITHUB_ENV
-          
-      - name: Inject AWS key
-        run: |
-          cd .github/hosted-runner/amd64/
-          ESCAPED_REPLACE_KEY_ID=$(printf '%s\n' "${{ secrets.AWS_ACCESS_KEY_ID }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/AWSID/$ESCAPED_REPLACE_KEY_ID/g" vars.tf
-          ESCAPED_REPLACE_ACCESS_KEY=$(printf '%s\n' "${{ secrets.AWS_SECRET_ACCESS_KEY }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/AWSSECRET/$ESCAPED_REPLACE_ACCESS_KEY/g" vars.tf
-          ESCAPED_REPLACE_ENVIRONMENT=$(printf '%s\n' "${{ needs.prebuild-package.outputs.branch_name }}-${{ steps.commit_hash.outputs.sha_short }}-release" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/ENVIRONMENT/$ESCAPED_REPLACE_ENVIRONMENT/g" vars.tf         
-
-      - name: setup terraform
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_version: 1.1.7
-          terraform_wrapper: false
-
-      - name: Terraform Init
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform init -input=false
-
-      - name: Terraform plan
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform plan -out=tfplan
-
-      - name: Terraform apply
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform apply -auto-approve tfplan
-
-      - name: Terraform output
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform output -raw ip > ip.txt
-          
-      - name: Persist IP to workspace
-        uses: actions/upload-artifact@v2
-        with:
-          name: ip
-          path: |
-            .github/hosted-runner/amd64/ip.txt
-          retention-days: 1
-
-      - name: Persist to workspace
-        uses: actions/upload-artifact@v2
-        with:
-          name: terraform2
-          path: |
-            .github/hosted-runner/amd64/terraform.tfstate
-          retention-days: 1
 
   build-win64:
     # The CMake configure and build commands are platform agnostic and should work equally
@@ -428,7 +342,7 @@ jobs:
           retention-days: 1
 
   build-cli-win64:
-    needs: [ build-win64 ]
+    needs: [ build-win64, release ]
     runs-on: ubuntu-latest
     steps:    
       - name: Checkout code
@@ -592,80 +506,6 @@ jobs:
           docker image ls -a
           docker push ${{ env.IMAGE_NAME }}:release-arm64
 
-  package-armv7:
-    needs: [ spinup-amd64-runner ]
-    runs-on: ${{ needs.spinup-amd64-runner.outputs.runner_label }}
-    if: github.event_name != 'pull_request'
-    steps:
-      - name: Attach to workspace
-        uses: actions/download-artifact@v2
-        with:
-          name: workspace
-
-      - name: Get branch name
-        shell: bash
-        run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
-
-      - name: Debug branch name
-        run: echo ${{ env.BRANCH_NAME }}
-
-      - name: Get VERSION
-        run: |
-          echo "VERSION=`cat ${{github.workspace}}/build/VERSION`" >> $GITHUB_ENV
-      - name: Debug version
-        run: echo ${{ env.VERSION }}
-
-      - name: Generate ref tag (master)
-        if: ${{ env.BRANCH_NAME == 'master' }}
-        run: |
-          echo "REF_TAG=latest" >> $GITHUB_ENV
-          echo "PRERELEASE=false" >> $GITHUB_ENV
-          echo "DRAFT=true" >> $GITHUB_ENV
-      - name: Debug ref tag
-        run: echo ${{ env.REF_TAG }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Replace token
-        run: |
-          sed -i -e "s/CP_TOKEN/${{ secrets.CRASHPAD_TOKEN }}/g" docker/run.sh
-      - name: Replace escape url
-        run: |
-          REPLACE=${{ secrets.BUGSPLAT_CP_URL }}
-          ESCAPED_REPLACE=$(printf '%s\n' "$REPLACE" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/CP_URL/$ESCAPED_REPLACE/g" docker/run.sh
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build + push - pktvisor (multi-arch)
-        env:
-          IMAGE_NAME: ghcr.io/orb-community/pktvisor
-        uses: docker/build-push-action@v3
-        with:
-          builder: ${{ steps.buildx.outputs.name }}
-          context: .
-          file: ./docker/Dockerfile
-          platforms: linux/arm/v7
-          tags: ${{ env.IMAGE_NAME }}:release-armv7
-          outputs: type=docker,dest=/tmp/armv7.tar
-
-      - name: Load image
-        env:
-          IMAGE_NAME: ghcr.io/orb-community/pktvisor
-        run: |
-          docker load --input /tmp/armv7.tar
-          docker image ls -a
-          docker push ${{ env.IMAGE_NAME }}:release-armv7
 
   package-amd64:
     needs: [ prebuild-package ]
@@ -866,88 +706,8 @@ jobs:
           cd .github/hosted-runner/arm64/
           terraform destroy -auto-approve
 
-  remove-github-runner-amd64:
-    continue-on-error: true
-    needs: [ package-armv7 ]
-    runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
-    steps:
-      - name: Attach to workspace
-        uses: actions/download-artifact@v2
-        with:
-          name: ip
-
-      - name: Get runner ip
-        id: address
-        run: |
-          ls -lha
-          echo "::set-output name=ip::$(cat ip.txt)"
-          
-      - name: Generate remove runner token
-        id: remove-token-amd64
-        run: |
-          curl -X POST -H "authorization: Bearer ${{ secrets.BOT_TOKEN }}" -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/orb-community/pktvisor/actions/runners/remove-token -o token.json
-          echo "::set-output name=remove-runner::$(cat token.json | jq .token --raw-output )"
-          cat token.json
-          echo "TOKEN_RUNNER_AMD64=$(cat token.json | jq .token --raw-output )" >> $GITHUB_ENV
-
-      - name: Executing remote ssh commands on runner
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ steps.address.outputs.ip }}
-          username: ubuntu
-          key: ${{ secrets.RUNNER_SSH_KEY }}
-          port: 22
-          script: |
-               cd /actions-runner
-               sudo chmod 777 . -R
-               ./config.sh remove --token ${{ env.TOKEN_RUNNER_AMD64 }}
-
-  remove-amd64-runner:
-    needs: [ remove-github-runner-amd64 ]
-    runs-on: ubuntu-latest
-    if: github.event_name != 'pull_request'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Attach to workspace
-        uses: actions/download-artifact@v2
-        with:
-          name: terraform2
-          path: .github/hosted-runner/amd64/
-
-      - name: Inject AWS key
-        run: |
-          cd .github/hosted-runner/amd64/
-          ESCAPED_REPLACE_KEY_ID=$(printf '%s\n' "${{ secrets.AWS_ACCESS_KEY_ID }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/AWSID/$ESCAPED_REPLACE_KEY_ID/g" vars.tf
-          ESCAPED_REPLACE_ACCESS_KEY=$(printf '%s\n' "${{ secrets.AWS_SECRET_ACCESS_KEY }}" | sed -e 's/[\/&]/\\&/g')
-          sed -i -e "s/AWSSECRET/$ESCAPED_REPLACE_ACCESS_KEY/g" vars.tf
-
-      - name: setup terraform
-        uses: hashicorp/setup-terraform@v2
-        with:
-          terraform_version: 1.1.7
-
-      - name: Terraform Init
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform init -input=false
-
-      - name: Terraform plan destroy
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform plan -destroy
-        continue-on-error: true
-
-      - name: Terraform destroy
-        run: |
-          cd .github/hosted-runner/amd64/
-          terraform destroy -auto-approve
-
   pushing-manifests:
-    needs: [ package-amd64 , package-arm64 , package-armv7 ]
+    needs: [ package-amd64 , package-arm64 ]
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
@@ -962,7 +722,6 @@ jobs:
         run: |
           docker manifest create ghcr.io/orb-community/pktvisor:latest \
           ghcr.io/orb-community/pktvisor:release-amd64 \
-          ghcr.io/orb-community/pktvisor:release-armv7 \
           ghcr.io/orb-community/pktvisor:release-arm64
 
       - name: Push manifest to ghcr.io

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.13)
 #######################################################
 
 # this is the source of truth for semver version
-project(visor VERSION 4.3.0)
+project(visor VERSION 4.4.0)
 
 # for main line release, this is empty
 # for development release, this is "-develop"

diff --git a/automated_tests/features/cleanup.feature b/automated_tests/features/cleanup.feature
@@ -1,3 +1,4 @@
+@AUTORETRY
 Feature: cleanup env
 
   @cleanup

diff --git a/automated_tests/features/pktvisor.feature b/automated_tests/features/pktvisor.feature
@@ -1,3 +1,4 @@
+@AUTORETRY
 Feature: pktvisor tests
 
 @smoke