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

Add support for converting OL 8 #112

Merged
merged 4 commits into from
Nov 12, 2020
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
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Install Requirements
run: |
yum install -y python-coverage python-nose python-six
yum install -y python-coverage python-nose python-six pexpect

- name: Check test coverage
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Install Requirements
run: |
yum install -y python-six
yum install -y python-six pexpect
curl https://bootstrap.pypa.io/2.6/get-pip.py -o get-pip.py
python get-pip.py
pip install pylint==1.1.0
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Install Requirements
run: |
yum --enablerepo=extras install -y epel-release # to get pylint
yum install -y python-six pylint
yum install -y python-six pylint pexpect

- name: Run Pylint Checks
run: ${{ env.interpreted_pylint }}
Expand All @@ -67,7 +67,7 @@ jobs:
- name: Install Requirements
run: |
yum --enablerepo=extras install -y epel-release # to get pylint
yum install -y pylint
yum install -y pylint python3-pexpect

- name: Run Pylint Checks
run: ${{ env.interpreted_pylint }}
2 changes: 1 addition & 1 deletion Dockerfiles/centos6
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ VOLUME /data
WORKDIR /data

RUN yum update -y &&\
yum install -y python-nose python-six python-wheel &&\
yum install -y python-nose python-six python-wheel pexpect &&\
yum clean all
2 changes: 1 addition & 1 deletion Dockerfiles/centos7
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ VOLUME /data
WORKDIR /data

RUN yum update -y &&\
yum install -y python-nose python-six python-wheel &&\
yum install -y python-nose python-six python-wheel pexpect &&\
yum clean all
2 changes: 1 addition & 1 deletion Dockerfiles/centos8
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ VOLUME /data
WORKDIR /data

RUN dnf update -y &&\
dnf install -y python3-nose python3-six &&\
dnf install -y python3-nose python3-six python3-pexpect &&\
dnf clean all

6 changes: 3 additions & 3 deletions convert2rhel/data/6/x86_64/configs/oracle-6-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[system_info]

# Fingerprints of GPG keys used for signing packages of the OS to be converted.
# The GPG keys are available at:
# https://docs.oracle.com/cd/E37670_01/E39381/html/ol_import_gpg.html
# The GPG key is available at:
# http://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol6
# Delimited by whitespace(s).
gpg_fingerprints = 72f97b74ec551f03

# List of packages that have to be removed before the system conversion starts.
# Delimited by any whitespace(s).
excluded_pkgs =
redhat-release-*
oraclelinux-release*
oracle*release*
oracle-logos
yum-plugin-ulninfo
linux-firmware
Expand Down
6 changes: 3 additions & 3 deletions convert2rhel/data/7/x86_64/configs/oracle-7-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[system_info]

# Fingerprints of GPG keys used for signing packages of the OS to be converted.
# The GPG keys are available at:
# https://docs.oracle.com/cd/E37670_01/E39381/html/ol_import_gpg.html
# The GPG key is available at:
# http://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol7
# Delimited by whitespace(s).
gpg_fingerprints = 72f97b74ec551f03

# List of packages that have to be removed before the system conversion starts.
# Delimited by any whitespace(s).
excluded_pkgs =
redhat-release-*
oraclelinux-release*
oracle*release*
oracle-logos
yum-plugin-ulninfo
akonadi-mysql
Expand Down
21 changes: 21 additions & 0 deletions convert2rhel/data/8/x86_64/configs/oracle-8-x86_64.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[system_info]

# Fingerprints of GPG keys used for signing packages of the OS to be converted.
# The GPG key is available at http://public-yum.oracle.com/RPM-GPG-KEY-oracle-ol8
# Delimited by whitespace(s).
gpg_fingerprints = 82562ea9ad986da3

# List of packages that have to be removed before the system conversion starts.
# Delimited by any whitespace(s).
excluded_pkgs =
oracle-logos*
oracle-indexhtml
oracle-backgrounds
oracle*release*
redhat-release*

# List of repoids to enable through subscription-manager when the --enablerepo option is not used.
# Delimited by any whitespace(s).
default_rhsm_repoids =
rhel-8-for-x86_64-baseos-rpms
rhel-8-for-x86_64-appstream-rpms
Loading