Skip to content

Commit 5bcf989

Browse files
committed
Remove ubuntu guest image from tobiko
With recent changes in tobiko 0.8.4, the tobiko pods will download an already customized image instead of using official ubuntu images that were customized during tobiko execution. Due to this, the guestfs-tools package is not neeeded anymore. Depends-On: openstack-k8s-operators/ci-framework#2619
1 parent d0b9e01 commit 5bcf989

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

container-images/tcib/base/tobiko/tobiko.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
tcib_envs:
22
USE_EXTERNAL_FILES: true
3+
TOBIKO_UPDATE_REPO: true
34
tcib_actions:
45
- run: bash /usr/local/bin/uid_gid_manage {{ tcib_user }}
56
- run: dnf -y install {{ tcib_packages.common | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
@@ -15,10 +16,6 @@ tcib_actions:
1516
| tar -zxvf - -C /usr/local/bin/
1617
- run: 'git clone https://opendev.org/x/tobiko /usr/local/src/tobiko'
1718
- run: 'pip install -e /usr/local/src/tobiko -c /usr/local/src/tobiko/upper-constraints.txt -r /usr/local/src/tobiko/extra-requirements.txt'
18-
- run: >-
19-
curl
20-
https://cloud-images.ubuntu.com/minimal/releases/jammy/release/ubuntu-22.04-minimal-cloudimg-amd64.img
21-
-o /usr/local/share/ubuntu-minimal
2219
- run: python3 -m pip install --upgrade pip
2320
- run: python3 -m pip install 'tox==4.13'
2421
- run: cp /usr/share/tcib/container-images/tcib/base/tobiko/run_tobiko.sh /usr/local/bin/run_tobiko.sh
@@ -34,11 +31,11 @@ tcib_packages:
3431
- python3
3532
- python3-devel
3633
- python3-pip
34+
- python3-setuptools
3735
- which
3836
- findutils
3937
- iproute
4038
- iputils
41-
- guestfs-tools
4239
- iperf3
4340
- tcpdump
4441
- podman

zuul.d/job.yaml

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,41 @@
2020
- OWNERS*
2121
vars: &edpm_vars
2222
cifmw_run_test_role: test_operator
23-
cifmw_run_tempest: true
23+
cifmw_test_operator_stages:
24+
- name: tempest
25+
type: tempest
26+
- name: tobiko
27+
type: tobiko
2428
cifmw_test_operator_tempest_registry: "{{ content_provider_os_registry_url | split('/') | first }}"
2529
cifmw_test_operator_tempest_namespace: "{{ content_provider_os_registry_url | split('/') | last }}"
2630
cifmw_test_operator_tempest_image_tag: "{{ content_provider_dlrn_md5_hash }}"
2731
cifmw_test_operator_tempest_include_list: |
2832
tempest.scenario.test_network_basic_ops.TestNetworkBasicOps
29-
cifmw_run_tobiko: true
3033
cifmw_test_operator_tobiko_registry: "{{ cifmw_test_operator_tempest_registry }}"
3134
cifmw_test_operator_tobiko_namespace: "{{ cifmw_test_operator_tempest_namespace }}"
3235
cifmw_test_operator_tobiko_image_tag: "{{ content_provider_dlrn_md5_hash }}"
33-
cifmw_test_operator_tobiko_testenv: "sanity"
36+
cifmw_test_operator_tobiko_workflow:
37+
- stepName: sanity
38+
testenv: sanity
39+
- stepName: scenario-nova
40+
testenv: nova
41+
# enabling heat is needed for some tobiko tests
42+
cifmw_edpm_prepare_kustomizations:
43+
- apiVersion: kustomize.config.k8s.io/v1beta1
44+
kind: Kustomization
45+
namespace: openstack
46+
patches:
47+
- patch: |-
48+
apiVersion: core.openstack.org/v1beta1
49+
kind: OpenStackControlPlane
50+
metadata:
51+
name: unused
52+
spec:
53+
heat:
54+
enabled: true
55+
target:
56+
kind: OpenStackControlPlane
57+
3458
3559
- job:
3660
name: tcib-crc-podified-edpm-baremetal

0 commit comments

Comments
 (0)