Remove some obsolete python*-distutils packages

Change-Id: I890c11a43e3044e85b182fa127f87533e329786f
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index baab414..3d49193 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -19,20 +19,26 @@
           node: v1.30
       - v1.29:
           node: v1.29
-      - v1.28:
-          node: v1.28
       - arm-latest:
+          node: latest
+      - arm-v1.32:
+          node: v1.32
+      - arm-v1.31:
+          node: v1.31
+      - arm-v1.30:
           node: v1.30
       - arm-v1.29:
           node: v1.29
-      - arm-v1.28:
-          node: v1.28
       - arm64-latest:
+          node: latest
+      - arm64-v1.32:
+          node: v1.32
+      - arm64-v1.31:
+          node: v1.31
+      - arm64-v1.30:
           node: v1.30
       - arm64-v1.29:
           node: v1.29
-      - arm64-v1.28:
-          node: v1.28
 
 - _functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-params'
@@ -50,20 +56,26 @@
           node: v1.30
       - v1.29:
           node: v1.29
-      - v1.28:
-          node: v1.28
       - arm-latest:
+          node: latest
+      - arm-v1.32:
+          node: v1.32
+      - arm-v1.31:
+          node: v1.31
+      - arm-v1.30:
           node: v1.30
       - arm-v1.29:
           node: v1.29
-      - arm-v1.28:
-          node: v1.28
       - arm64-latest:
+          node: latest
+      - arm64-v1.32:
+          node: v1.32
+      - arm64-v1.31:
+          node: v1.31
+      - arm64-v1.30:
           node: v1.30
       - arm64-v1.29:
           node: v1.29
-      - arm64-v1.28:
-          node: v1.28
 
 - _functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-params'
@@ -81,20 +93,26 @@
           node: v1.30
       - v1.29:
           node: v1.29
-      - v1.28:
-          node: v1.28
       - arm-latest:
+          node: latest
+      - arm-v1.32:
+          node: v1.32
+      - arm-v1.31:
+          node: v1.31
+      - arm-v1.30:
           node: v1.30
       - arm-v1.29:
           node: v1.29
-      - arm-v1.28:
-          node: v1.28
       - arm64-latest:
+          node: latest
+      - arm64-v1.32:
+          node: v1.32
+      - arm64-v1.31:
+          node: v1.31
+      - arm64-v1.30:
           node: v1.30
       - arm64-v1.29:
           node: v1.29
-      - arm64-v1.28:
-          node: v1.28
 
 - _functest-kubernetes-pi-ollivier-functest-kubernetes-security-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-security-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-params'
@@ -112,20 +130,26 @@
           node: v1.30
       - v1.29:
           node: v1.29
-      - v1.28:
-          node: v1.28
       - arm-latest:
+          node: latest
+      - arm-v1.32:
+          node: v1.32
+      - arm-v1.31:
+          node: v1.31
+      - arm-v1.30:
           node: v1.30
       - arm-v1.29:
           node: v1.29
-      - arm-v1.28:
-          node: v1.28
       - arm64-latest:
+          node: latest
+      - arm64-v1.32:
+          node: v1.32
+      - arm64-v1.31:
+          node: v1.31
+      - arm64-v1.30:
           node: v1.30
       - arm64-v1.29:
           node: v1.29
-      - arm64-v1.28:
-          node: v1.28
 
 - _functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-params'
@@ -143,20 +167,26 @@
           node: v1.30
       - v1.29:
           node: v1.29
-      - v1.28:
-          node: v1.28
       - arm-latest:
+          node: latest
+      - arm-v1.32:
+          node: v1.32
+      - arm-v1.31:
+          node: v1.31
+      - arm-v1.30:
           node: v1.30
       - arm-v1.29:
           node: v1.29
-      - arm-v1.28:
-          node: v1.28
       - arm64-latest:
+          node: latest
+      - arm64-v1.32:
+          node: v1.32
+      - arm64-v1.31:
+          node: v1.31
+      - arm64-v1.30:
           node: v1.30
       - arm64-v1.29:
           node: v1.29
-      - arm64-v1.28:
-          node: v1.28
 
 - _functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params: &functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params
     name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-params'
@@ -174,20 +204,26 @@
           node: v1.30
       - v1.29:
           node: v1.29
-      - v1.28:
-          node: v1.28
       - arm-latest:
+          node: latest
+      - arm-v1.32:
+          node: v1.32
+      - arm-v1.31:
+          node: v1.31
+      - arm-v1.30:
           node: v1.30
       - arm-v1.29:
           node: v1.29
-      - arm-v1.28:
-          node: v1.28
       - arm64-latest:
+          node: latest
+      - arm64-v1.32:
+          node: v1.32
+      - arm64-v1.31:
+          node: v1.31
+      - arm64-v1.30:
           node: v1.30
       - arm64-v1.29:
           node: v1.29
-      - arm64-v1.28:
-          node: v1.28
 
 - _functest-kubernetes-pi-jobs: &functest-kubernetes-pi-jobs
     name: 'functest-kubernetes-pi-jobs'

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 0548885..cd0cdc8 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -39,12 +39,6 @@
           branch: stable/v1.29
           node: v1.29
           dependency: 3.16
-      - v1.28:
-          from:
-          build_args:
-          branch: stable/v1.28
-          node: v1.28
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params: &functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-params'
@@ -82,12 +76,6 @@
           branch: stable/v1.29
           node: v1.29
           dependency: 3.16
-      - v1.28:
-          from:
-          build_args:
-          branch: stable/v1.28
-          node: v1.28
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-smoke-params: &functest-kubernetes-opnfv-functest-kubernetes-smoke-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-params'
@@ -125,12 +113,6 @@
           branch: stable/v1.29
           node: v1.29
           dependency: 3.16
-      - v1.28:
-          from:
-          build_args:
-          branch: stable/v1.28
-          node: v1.28
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-security-params: &functest-kubernetes-opnfv-functest-kubernetes-security-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-params'
@@ -168,12 +150,6 @@
           branch: stable/v1.29
           node: v1.29
           dependency: 3.16
-      - v1.28:
-          from:
-          build_args:
-          branch: stable/v1.28
-          node: v1.28
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params: &functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-params'
@@ -211,12 +187,6 @@
           branch: stable/v1.29
           node: v1.29
           dependency: 3.16
-      - v1.28:
-          from:
-          build_args:
-          branch: stable/v1.28
-          node: v1.28
-          dependency: 3.16
 
 - _functest-kubernetes-opnfv-functest-kubernetes-cnf-params: &functest-kubernetes-opnfv-functest-kubernetes-cnf-params
     name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-params'
@@ -254,12 +224,6 @@
           branch: stable/v1.29
           node: v1.29
           dependency: 3.16
-      - v1.28:
-          from:
-          build_args:
-          branch: stable/v1.28
-          node: v1.28
-          dependency: 3.16
 
 - _functest-kubernetes-jobs: &functest-kubernetes-jobs
     name: 'functest-kubernetes-jobs'
@@ -1004,8 +968,6 @@
           dependency: 3.20
       - v1.29:
           dependency: 3.16
-      - v1.28:
-          dependency: 3.16
 
 - project:
     name: 'functest-kubernetes-dep-pull'
@@ -1043,9 +1005,9 @@
           DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
-            python3.12 python3.12-dev python3.12-distutils \
-            python3.11 python3.11-dev python3.11-distutils \
-            python3.10 python3.10-dev python3.10-distutils \
+            python3.12 python3.12-dev \
+            python3.11 python3.11-dev \
+            python3.10 python3.10-dev \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3-pip enchant-2 -y

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index f001a37..31c0391 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -1282,9 +1282,9 @@
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
-            python3.12 python3.12-dev python3.12-distutils \
-            python3.11 python3.11-dev python3.11-distutils \
-            python3.10 python3.10-dev python3.10-distutils \
+            python3.12 python3.12-dev \
+            python3.11 python3.11-dev \
+            python3.10 python3.10-dev \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3-pip enchant-2 -y

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index d7dab86..ea95362 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -570,9 +570,9 @@
           sudo DEBIAN_FRONTEND=noninteractive apt-get \
             -o DPkg::Lock::Timeout=300 install \
             libxml2-dev libxslt-dev libffi-dev libjpeg-dev \
-            python3.12 python3.12-dev python3.12-distutils \
-            python3.11 python3.11-dev python3.11-distutils \
-            python3.10 python3.10-dev python3.10-distutils \
+            python3.12 python3.12-dev \
+            python3.11 python3.11-dev \
+            python3.10 python3.10-dev \
             python3.9 python3.9-dev python3.9-distutils \
             python3.8 python3.8-dev python3.8-distutils \
             python3-pip enchant-2 -y