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

Modifying conditions for additional packages requirements on RHEL7 Marketplace, RHEL7 and OEL7 #180

Merged
merged 2 commits into from
Jan 30, 2025

Conversation

gmarcospythian
Copy link
Contributor

@gmarcospythian gmarcospythian commented Jan 25, 2025

Change Description:

Modifying conditions for additional packages requirements on RHEL7 Marketplace, RHEL7 and OEL7. The adjustment comes for the optional rpms repository. The verification for RHEL7 marketplace and RHEL differs, additional checks and name change on the repos were added.

Solution Overview:

The validation against the repo names from RHEL7 Marketplace, RHEL7 and OEL7 were updated. There are new conditions to verify one or the other version.

The change for RHEL 7 is to manage the repos names that have been changed due to end of life support. The name on RHEL7 Marketplace for the repo description is rhui-rhel-7-server-rhui-optional-rpms while on the non market place is rhel-7-server-optional-rpms.

The reason OEL 8/RHEL 8 is not considered is due to the images are available directly from gce and the name of the repo has not changed. Please let me know if this clarified this request.

Test Commands:

time ./install-oracle.sh --ora-swlib-bucket gs://pythian-gto-oracle-software/19c
--instance-ssh-user marcos --instance-ssh-key ~/.ssh/id_rsa
--backup-dest "+RECO" --ora-swlib-path /u02/swlib/
--ora-version 19 --ora-swlib-type gcs
--ora-asm-disks ~/asm_disk_config.json --ora-data-mounts ~/data_mounts_config.json
--cluster-type NONE --ora-data-diskgroup DATA --ora-reco-diskgroup RECO
--ora-db-name orcl --ora-db-container false
--instance-ip-addr 10.2.80.4 --instance-hostname gmz-rhel-7-9-brew --allow-install-on-vm

time ./install-oracle.sh --ora-swlib-bucket gs://pythian-gto-oracle-software/19c
--instance-ssh-user marcos --instance-ssh-key ~/.ssh/id_rsa
--backup-dest "+RECO" --ora-swlib-path /u02/swlib/
--ora-version 19 --ora-swlib-type gcs
--ora-asm-disks ~/asm_disk_config.json --ora-data-mounts ~/data_mounts_config.json
--cluster-type NONE --ora-data-diskgroup DATA --ora-reco-diskgroup RECO
--ora-db-name orcl --ora-db-container false
--instance-ip-addr 10.2.80.50 --instance-hostname marcos-db-ol7-8fu3 --allow-install-on-vm

Test Prep:

VM created with REHL7 from Market place
VM created with OEL7

Test 1: details:

https://gist.github.com/gmarcospythian/8e39d8de1bd8d889d6ac5a069d055636

Expected Results:

The script finishes without errors

gmarcospythian and others added 2 commits January 22, 2025 12:29
…rketplace, RHEL7 and OEL7 dev/oratk-26 (google#18)

* Small formatting udpates

* Revert "Small formatting udpates"

This reverts commit 20c1983d049df0930190c87f380f9af7cbfe19af.

* Add Gabriel's changes to dev/ branch

* Revert "Add Gabriel's changes to dev/ branch"

This reverts commit 9888dfe745017424b4c0218190d8940d9d3a0615.

* Modifying conditions for additional packages reuirements on RHEL7 Marketplace, RHEL7 and OEL7 (google#16)

* Small formatting changes, only to blocks updated by Gabriel

---------

Co-authored-by: Simon Pane <pane@pythian.com>
Copy link

google-cla bot commented Jan 25, 2025

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

Copy link

Hi @gmarcospythian. Thanks for your PR.

I'm waiting for a google member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mfielding
Copy link
Member

/test bms-toolkit-install

Copy link
Member

@mfielding mfielding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can I ask for a bit more context in the PR description? A few questions it could answer:
What is the difference between RHEL7 marketplace and RHEL7 installs from the persepctive of the toolkit? What's the problem with the existing logic?
What about, say, RHEL8/OL8? Why don't these changes need to apply there?

roles/ora-host/tasks/main.yml Show resolved Hide resolved
roles/ora-host/tasks/main.yml Show resolved Hide resolved
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gmarcospythian, mfielding

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mfielding
Copy link
Member

@mfielding mfielding merged commit 43845b3 into google:master Jan 30, 2025
2 checks passed
@simonpane simonpane deleted the rel/oratk-26 branch January 30, 2025 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants