Skip to content

Commit

Permalink
Remove some obsolete python*-distutils packages
Browse files Browse the repository at this point in the history
Change-Id: I890c11a43e3044e85b182fa127f87533e329786f
Signed-off-by: Cédric Ollivier <[email protected]>
  • Loading branch information
collivier committed Jan 17, 2025
1 parent 48b7c71 commit e3d6d69
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 83 deletions.
108 changes: 72 additions & 36 deletions jjb/functest/functest-kubernetes-pi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down
44 changes: 3 additions & 41 deletions jjb/functest/functest-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -1004,8 +968,6 @@
dependency: 3.20
- v1.29:
dependency: 3.16
- v1.28:
dependency: 3.16

- project:
name: 'functest-kubernetes-dep-pull'
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jjb/functest/functest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jjb/functest/xtesting.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e3d6d69

Please sign in to comment.