Stop using ubuntu 18.04

CybercentreCanada · Jul 29, 2021 · 95a25be · 95a25be
1 parent 8bf218c
commit 95a25be
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 52 deletions.
diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml
@@ -6,30 +6,30 @@ trigger:
 pr: none
 
 pool:
-  vmImage: 'ubuntu-18.04'
+  vmImage: "ubuntu-20.04"
 
 stages:
-- stage: deploy
-  jobs:
-  - job: deploy
-    displayName: Deploy containers to dockerhub
-    variables:
-      - group: deployment-information
-    steps:
-    - task: Docker@2
-      displayName: Login to docker hub
-      inputs:
-        command: login
-        containerRegistry: dockerhub
-    - script: |
-        set -xv  # Echo commands before they are run
-        export TAG=${BUILD_SOURCEBRANCH#"refs/tags/v"}
-        if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=latest; fi
-        docker build --build-arg version=$TAG --build-arg branch=$BUILD_TYPE -t cccs/assemblyline-service-avclass:$TAG -t cccs/assemblyline-service-avclass:$BUILD_TYPE .
-      displayName: Build containers
-    - script: |
-        docker run -v `pwd`/test/:/opt/al_service/test/ cccs/assemblyline-service-avclass:latest bash -c 'pip install -U -r test/requirements.txt; pytest'
-      displayName: Test containers
-    - script: |
-        docker push cccs/assemblyline-service-avclass --all-tags
-      displayName: Deploy to Docker Hub
+  - stage: deploy
+    jobs:
+      - job: deploy
+        displayName: Deploy containers to dockerhub
+        variables:
+          - group: deployment-information
+        steps:
+          - task: Docker@2
+            displayName: Login to docker hub
+            inputs:
+              command: login
+              containerRegistry: dockerhub
+          - script: |
+              set -xv  # Echo commands before they are run
+              export TAG=${BUILD_SOURCEBRANCH#"refs/tags/v"}
+              if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=latest; fi
+              docker build --build-arg version=$TAG --build-arg branch=$BUILD_TYPE -t cccs/assemblyline-service-avclass:$TAG -t cccs/assemblyline-service-avclass:$BUILD_TYPE .
+            displayName: Build containers
+          - script: |
+              docker run -v `pwd`/test/:/opt/al_service/test/ cccs/assemblyline-service-avclass:latest bash -c 'pip install -U -r test/requirements.txt; pytest'
+            displayName: Test containers
+          - script: |
+              docker push cccs/assemblyline-service-avclass --all-tags
+            displayName: Deploy to Docker Hub
diff --git a/pipelines/azure-tests.yaml b/pipelines/azure-tests.yaml
@@ -4,34 +4,34 @@ trigger: ["*"]
 pr: ["*"]
 
 pool:
-  vmImage: 'ubuntu-18.04'
+  vmImage: "ubuntu-20.04"
 
 jobs:
-- job: run_test
-  strategy:
-    matrix:
-      python3_7:
-        python.version: '3.7'
-      Python3_8:
-        python.version: '3.8'
+  - job: run_test
+    strategy:
+      matrix:
+        python3_7:
+          python.version: "3.7"
+        Python3_8:
+          python.version: "3.8"
 
-  timeoutInMinutes: 10
+    timeoutInMinutes: 10
 
-  steps:
-    - task: UsePythonVersion@0
-      displayName: Set python version
-      inputs:
-        versionSpec: '$(python.version)'
-    - script: |
-        set -xv  # Echo commands before they are run
-        sudo apt-get update
-        sudo apt-get install -y libfuzzy-dev libfuzzy2
-        sudo rm -rf /var/lib/apt/lists/*
-        sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir assemblyline assemblyline_v4_service
-        sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir -r `pwd`/test/requirements.txt
-        sudo rm -rf /tmp/* /var/lib/apt/lists/* ~/.cache/pip
-      displayName: Setup environment
-    - script: python -m pytest --durations=10 -rsx -vv --cov-report=xml --cov=avclass
-      displayName: Test
-    - script: python -m codecov
-      displayName: Upload Coverage
+    steps:
+      - task: UsePythonVersion@0
+        displayName: Set python version
+        inputs:
+          versionSpec: "$(python.version)"
+      - script: |
+          set -xv  # Echo commands before they are run
+          sudo apt-get update
+          sudo apt-get install -y libfuzzy-dev libfuzzy2
+          sudo rm -rf /var/lib/apt/lists/*
+          sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir assemblyline assemblyline_v4_service
+          sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir -r `pwd`/test/requirements.txt
+          sudo rm -rf /tmp/* /var/lib/apt/lists/* ~/.cache/pip
+        displayName: Setup environment
+      - script: python -m pytest --durations=10 -rsx -vv --cov-report=xml --cov=avclass
+        displayName: Test
+      - script: python -m codecov
+        displayName: Upload Coverage
diff --git a/test/test_service.py → test/test_avclass.py b/test/test_service.py → test/test_avclass.py