Merge "Chore: Move to centos8-builder"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 1b3d97c..38f914e 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234
 LABELS=centos7-builder-2c-1g
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 43361f8..a2cdcaa 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20211001-132245.747
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20220919-201945.234
 LABELS=centos7-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
index d8ca726..4567d1e 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20211011-195645.572
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20220919-201912.261
 LABELS=centos7-docker-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
index b41ed8f..1dac4ea 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/queue-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20210306-131321.125
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=queue-docker-4c-4g
 HARDWARE_ID=v3-standard-4
 INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 284de63..1db2ade 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220829-213803.583
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220919-172301.743
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
index 7232133..8b1e954 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=ubuntu1804-docker-8c-16g
 HARDWARE_ID=v3-standard-16

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
index 986d81e..6466685 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=ubuntu1804-docker-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
index a137662..1545bbf 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220829-195201.926
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220919-185927.020
 LABELS=ubuntu1804-docker-v1-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
index 6da3a50..2f7b62a 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-helm-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220829-213839.699
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - helm - x86_64 - 20220919-172402.717
 LABELS=ubuntu1804-helm-2c-1g
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 68c84c9..ed523fa 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
@@ -77,7 +77,7 @@
     project-name: aai-aai-common
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/aai-common
     branch: master
 

diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 65a1731..5fad24f 100644 (file)
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -14,7 +14,7 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -82,6 +82,6 @@
     project-name: aai-babel
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/babel
     branch: master

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index aa56425..91c5755 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -77,6 +77,6 @@
     project-name: aai-graphadmin
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/graphadmin
     branch: master

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 45c454d..555aadb 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -68,6 +68,6 @@
     project-name: aai-graphgraph
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/graphgraph
     branch: master

diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 000e409..2e86408 100644 (file)
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
@@ -65,6 +65,6 @@
     project-name: aai-logging-service
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/logging-service
     branch: master

diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index fd65679..e52ab21 100644 (file)
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -14,7 +14,7 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -80,7 +80,7 @@
     project-name: aai-model-loader
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/model-loader
     branch: master
 

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 8787173..2632d2c 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -16,7 +16,7 @@
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -81,7 +81,7 @@
     project-name: aai-resources
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/resources
     branch: master
     java-version: openjdk8

diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 8b80d6c..4640444 100644 (file)
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - '{project-name}-gerrit-release-jobs':
@@ -65,6 +65,6 @@
     project-name: aai-rest-client
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/rest-client
     branch: master

diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml
index 23db9c4..9430a24 100644 (file)
--- a/jjb/aai/aai-schema-service.yaml
+++ b/jjb/aai/aai-schema-service.yaml
@@ -13,7 +13,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -77,6 +77,6 @@
     project-name: aai-schema-service
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/schema-service
     branch: master

diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index a89af36..690ebf1 100644 (file)
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -14,7 +14,7 @@
           cron: '@daily'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -79,7 +79,7 @@
     project-name: aai-sparky-be
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/sparky-be
     branch: master
 

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index aa3aa8d..0f0bd8d 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -2,7 +2,7 @@
 - project:
     name: sparky-fe
     project-name: 'aai-sparky-fe'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'centos8-builder-4c-4g'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -27,7 +27,7 @@
     project-name: aai-sparky-fe
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/sparky-fe
     branch: master
 

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index dce710e..e1e0085 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -16,7 +16,7 @@
       - gerrit-maven-stage:
           mvn-params: '-DskipTests'
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           maven-versions-plugin: true
           sbom-generator: true
       - gerrit-maven-docker-stage:
@@ -80,6 +80,6 @@
     project-name: aai-traversal
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: aai/traversal
     branch: master

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 29b5e12..5e3776f 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -15,7 +15,7 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
@@ -113,7 +113,7 @@
     project-name: ccsdk-apps
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: ccsdk/apps
     branch: master
 

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 6b2b982..1627a3e 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -9,7 +9,7 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           mvn-opts: '-Ddocker.skip=true'
@@ -61,13 +61,13 @@
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-oran-settings'
     mvn-opts: '-Ddocker.skip=true'
-    build-node: centos7-builder-4c-4g
+    build-node: centos8-builder-4c-4g
 
 - project:
     name: ccsdk-oran-info
     project: ccsdk/oran
     project-name: ccsdk-oran
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     jobs:
       - gerrit-info-yaml-verify
 

diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 426eea6..3b79f23 100644 (file)
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -9,7 +9,7 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
@@ -55,7 +55,7 @@
           cron: '@daily'
           mvn-params: '-Ddocker.skip.push=true -P docker'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           cron: ''
@@ -94,7 +94,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-builder-4c-4g
+    build-node: centos8-builder-4c-4g
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
@@ -121,14 +121,14 @@
     java-version: openjdk11
     mvn-version: 'mvn38'
     mvn-settings: 'ccsdk-cds-settings'
-    build-node: centos7-builder-4c-4g
+    build-node: centos8-builder-4c-4g
 
 - project:
     name: ccsdk-cds-info
     project-name: ccsdk-cds
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: ccsdk/cds
     branch: master
 

diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml
new file mode 100644 (file)
index 0000000..a3c64ce
--- /dev/null
+++ b/jjb/ccsdk/odl-legacy.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: ccsdk-odl-legacy-project-view
+    project-name: ccsdk-odl-legacy
+    views:
+      - project-view
+
+- project:
+    name: ccsdk-odl-legacy-info
+    project: ccsdk/odl-legacy
+    project-name: ccsdk-odl-legacy
+    build-node: centos7-builder-2c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index 8f9bc3f..212a061 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -23,6 +23,7 @@
       - compare-type: ANT
         pattern: 'components/slice-analysis-ms/**'
     mvn-snapshot-id: 'ecomp-snapshots'
+    mvn-version: 'mvn36'
     nexus-snapshot-repo: 'snapshots'
     files: '**'
     archive-artifacts: ''
@@ -54,6 +55,7 @@
           branch: 'master'
     java-version: openjdk11
     mvn-settings: 'dcaegen2-services-settings'
+    mvn-version: 'mvn36'
     files: '**'
     archive-artifacts: ''
     gerrit_trigger_file_paths:

diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml
index 0a8303c..36a51fc 100644 (file)
--- a/jjb/vvp/vvp-test-engine.yaml
+++ b/jjb/vvp/vvp-test-engine.yaml
@@ -7,7 +7,7 @@
     branch: master
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
 - project:
     name: vvp-test-engine-sonar
@@ -35,7 +35,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vvp-test-engine-settings'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'centos8-builder-4c-4g'
     subproject:
       - 'onap-client':
           path: 'onap-client'

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index 1b92859..21af013 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -19,17 +19,6 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox and deps
-      pip:
-        name:
-          - tox
-          - tox-pyenv
-          - virtualenv
-          - more-itertools~=5.0.0
-          - zipp==1.0.0
-        state: present
-      become: true
-
     - name: Install Python 3.6 and packages
       apt:
         name:

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 45fdaf1..32aa2c3 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -61,17 +61,6 @@
       become: true
       when: ansible_distribution == 'Ubuntu'
 
-    - name: Install python-tox and deps
-      pip:
-        name:
-          - tox
-          - tox-pyenv
-          - virtualenv
-          - more-itertools~=5.0.0
-          - zipp==1.0.0
-        state: present
-      become: true
-
     - apt_repository:
         repo: ppa:deadsnakes/ppa
         state: present