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.

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

Update cldr-runner EE to use centos stream 9 as base image #85

Merged
merged 4 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions aws/bindep.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@

# System dependencies for AWS cldr-runner

unzip
curl
unzip
2 changes: 1 addition & 1 deletion azure/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@

collections:
- name: azure.azcollection
version: 1.11.0
version: 1.14.0
- name: netapp.azure
version: 21.10.0
14 changes: 12 additions & 2 deletions base/execution-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,31 @@

version: 3

images:
base_image:
name: quay.io/centos/centos:stream9

dependencies:
ansible_core:
package_pip: ansible-core~=2.12.10
ansible_runner:
package_pip: ansible-runner~=2.1.4
galaxy: requirements.yml
python: requirements.txt
system: bindep.txt
python_interpreter:
package_system: "python39"

additional_build_files:
- src: bashrc
dest: assets

additional_build_steps:
prepend_base:
- RUN yum install -y git
- RUN dnf clean all -y && rm -rf /var/cache/yum /var/cache/dnf /tmp/src
prepend_builder:
- RUN yum install -y yum-utils && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
- RUN yum install -y yum-utils && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
prepend_final:
- ARG BUILD_VER="latest"
- ARG BUILD_DATE="unknown"
Expand All @@ -56,6 +67,5 @@ additional_build_steps:
- RUN dnf clean all -y && rm -rf /var/cache/yum /var/cache/dnf /tmp/src
append_final:
- ADD _build/assets/bashrc /runner/.bashrc
- RUN alternatives --set python /usr/bin/python3
- RUN /usr/bin/python3 -m pip cache purge || echo "No Pip cache to purge"
- RUN dnf clean all -y && rm -rf /var/cache/yum /var/cache/dnf /tmp/src
1 change: 0 additions & 1 deletion full/bindep.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ tree

# AWS
unzip
curl

# GCP
google-cloud-cli
2 changes: 1 addition & 1 deletion full/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ collections:
- name: community.aws
version: 3.0.1
- name: azure.azcollection
version: 1.11.0
version: 1.14.0
- name: netapp.azure
version: 21.10.0
- name: google.cloud
Expand Down