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

Merge OCI changes to release-5.2.0 branch #1631

Merged
merged 227 commits into from
Nov 17, 2023
Merged

Merge OCI changes to release-5.2.0 branch #1631

merged 227 commits into from
Nov 17, 2023

Conversation

sowmya-dixit
Copy link
Collaborator

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

Please choose appropriate options.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes in the below checkboxes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Ran Test A
  • Ran Test B

Test Configuration:

  • Software versions:
  • Hardware versions:

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

ddevadat and others added 30 commits December 22, 2022 13:16
@ddevadat
added artifact upload role for oci oss
12de5e6 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
overwrite file in oss if the file exists
ea2c778 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added artifact download for oci role
852a610 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added role to install oci-cli
3ee3b85 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added csp choice based cloud cli installation
3ee652e 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added env variables for oci cli for analytics user
4ffea4d 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
install oci cli as analytics user
8a70a47 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
adding oci cli in PATH variable for analytics user
69f2e83 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
install oci-cli in analytics home location
4ce637d 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
disabled cloud cli temporarlily
2733374 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
setting env variable with double quotes
2e4cf61 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
placed oci cli env variables in /etc/environment file
2bbab17 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added jinja2 template for oci cli config
d0d1b1d 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
renamed dir templates to template
cc11113 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
disabled only oci cli temporarily
2e11eaf 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
testing idempotency for oci cli
054d9db 
Signed-off-by: Deepak Devadathan <[email protected]>
@heungheung
change Spark provision task with Ruby 2.6
b1de737 
In release 4.6.0, Ruby 2.6 is being used. Don't know why in 4.10 / 5.0, Ruby suddenly became 2.2.

In fact, there is NO ruby2.2-dev for bionic. Changing to Ruby 2.6 to proceed
@ddevadat
added apiversion selector
07d4e5e 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
Merge branch 'oci-5.1.0' of https://github.com/ocisunbird/sunbird-dat…
17de1fa 
…a-pipeline into oci-5.1.0
@ddevadat
added the oci oss bucket upload
9ba6497 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added full path of oci from analaytics home
5fa0e00 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
correction in oci cli location
329e820 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
check bucket existence before creating
86b024d 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
testing the logic for register variable
51894db 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
using full path for oci cli
cbb93c1 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
testing the bucket check
47ccff0 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
added the always tag individually
d3b24a9 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
place an oci os upload command for every upload
3c79310 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
corrected typo for oci cli command
5e4749e 
Signed-off-by: Deepak Devadathan <[email protected]>
@ddevadat
corrected typo for oci cli command
b7daec6 
Signed-off-by: Deepak Devadathan <[email protected]>
ddevadat and others added 25 commits October 17, 2023 16:00
@ddevadat
removed unwanted oci cli steps
7e5427b 
Signed-off-by: Deepak Devadathan <[email protected]>
@manjudr
Merge pull request Sunbird-Obsrv#1620 from dicdiksha/test-oci-5.1.0-g…
aafe835 
…ithub-99-deploy-job

ED-2069: Add OCI oss support  superseed PR 1617,1615,1608,1602
@SadanandGowda
Added cloud storage services AWS and GCP
850ffac
@SadanandGowda
Added cloud storage services AWS and GCP
3fa4da9
@SadanandGowda
updated common vars
63679d5 
Update oci changes
@SadanandGowda
common variable changes in data-pipeline
9d36568 
Update oci changes
@SadanandGowda
updated secor csp variables
75b971d
@SadanandGowda
updated analytics spark csp variables
6df2fa0
@SadanandGowda
common variable changes in datapipeline/flink-jobs
a599296
@SadanandGowda
common variable changes in datapipeline/flink-jobs
93e5207 
Updated the oci changes
@SadanandGowda
csp migration variables update
76bcf5d
@SadanandGowda
csp migration variables update
0a613c7 
Updated oci changes
@SadanandGowda
csp migration variables update
f8a9f23
@SadanandGowda
certjob-workflow update
a3a4b59
@SadanandGowda
oci changes merge update
d797623
@SadanandGowda
csp migration variables update
4f06f64
@SadanandGowda
csp migration variables update
3d2cb95
@SadanandGowda
csp migration variables update
e2101ac
@SadanandGowda
csp migration variables update
1b5ebb8
@SadanandGowda
Update main.yml
7874a2e
@SadanandGowda
Merge branch 'csp_changes' into HEAD
9c66a1b 
Update csp changes with OCI changes
@SadanandGowda
oci changes merge update
700eb68
@kumarks1122 @SadanandGowda
LR-539 | Encryption key length update added
dccad63
@kumarks1122 @SadanandGowda
LR-539 | Encryption key length update added
b152a29
@SadanandGowda
oci changes merge update
7680ec6
sowmya-dixit
sowmya-dixit commented Nov 14, 2023
View reviewed changes
ansible/roles/data-products-deploy/templates/common.conf.j2 Outdated
@@ -20,6 +18,7 @@ cloud_storage_telemetry_type="azure"
cloud_storage_telemetry_type="s3"
cloud_private_storage_endpoint="{{ s3_storage_endpoint | regex_replace('^[a-z]+://(.*)$', '\\1') }}"
cloud_storage_endpoint_with_protocol="{{ s3_storage_endpoint }}"
>>>>>>> 72bae4d12 (common variable changes in datapipeline/flink-jobs)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@SadanandGowda Can you remove this line?

@manjudr manjudr merged commit c826125 into Sunbird-Obsrv:release-5.2.0 Nov 17, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manjudr manjudr manjudr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@sowmya-dixit @manjudr @ddevadat @heungheung @santhosh-tg @anandp504 @subhashchandrab @SadanandGowda @kumarks1122