Merge "Chore: Move to ubuntu2004-builder"

diff --combined jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index 911be77,56708fe..a574666
--- 1/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
--- 2/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@@ -8,6 -8,8 +8,6 @@@
      stream:
        - 'master':
            branch: 'master'
 -      - 'istanbul':
 -          branch: 'istanbul'
        - 'jakarta':
            branch: 'jakarta'
      build-node: ubuntu1804-docker-8c-8g
@@@ -41,7 -43,7 +41,7 @@@
      sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
      sonar-mvn-goal: '{sonar_mvn_goal}'
      cron: '@daily'
-     build-node: ubuntu1804-builder-4c-4g
+     build-node: ubuntu2004-builder-4c-4g
      project: 'dcaegen2/collectors/snmptrap'
      project-name: 'dcaegen2-collectors-snmptrap'
      branch: 'master'