Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bumps s390x VM to RHEL 8.8 #1319

Closed
wants to merge 6 commits into from
Closed

Bumps s390x VM to RHEL 8.8 #1319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48efa3f
Bumps s390x VM to RHEL 8.8
Stringy Sep 11, 2023
01a4fd5
DNF not yum
Stringy Sep 11, 2023
c5c3626
state present in redhat provisoning instead of latest
Stringy Sep 11, 2023
3c8aa4e
Adds RHEL 8.8 image ID
Stringy Sep 11, 2023
f54f209
Include some go mod updates
Stringy Sep 11, 2023
f7a597a
Enable s390x eBPF testing
Stringy Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ansible/group_vars/all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ redhat_password: "{{ lookup('env', 'REDHAT_PASSWORD', default='') }}"
excluded_pairs:
# e.g. - ['ubuntu-1804-lts', 'core_bpf']
# This can be removed once we have downloadable s390x eBPF drivers
- [ 'rhel-8-6-s390x', 'ebpf' ]
#- [ 'rhel-8-8-s390x', 'ebpf' ]

virtual_machines:
rhel:
Expand All @@ -35,7 +35,7 @@ virtual_machines:
rhel-s390x:
project: rhel-s390x-cloud
families:
- rhel-8-6-s390x
- rhel-8-8-s390x

rhel-sap:
project: rhel-sap-cloud
Expand Down
6 changes: 4 additions & 2 deletions ansible/roles/create-vm/vars/s390x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
#rhel-8-6-s390x
vsi_image_id: r038-0d89bf54-c28f-4dc4-bec0-0f8e03a74de3
vsi_profile: bz2-2x8
#vsi_image_id: r038-0d89bf54-c28f-4dc4-bec0-0f8e03a74de3
#rhel-8-8-s390x
vsi_image_id: r038-a02662f2-ae0d-4308-929b-d327f008d136
vsi_profile: bz2-2x8
4 changes: 2 additions & 2 deletions ansible/roles/provision-vm/tasks/redhat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
yum update -y

- name: Install docker
yum:
dnf:
name:
- docker-ce
- docker-ce-cli
- containerd.io
state: latest
#state: latest
update_cache: true

1 change: 1 addition & 0 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
github.com/hashicorp/go-multierror v1.1.1
github.com/jstemmer/go-junit-report v1.0.0 // indirect
github.com/pkg/errors v0.8.1
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.2.2
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/jstemmer/go-junit-report v1.0.0 h1:8X1gzZpR+nVQLAht+L/foqOeX2l9DTZoaIPbEQHxsds=
github.com/jstemmer/go-junit-report v1.0.0/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
Loading