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

Change refs to tags in the manifests #2073

Merged
merged 2 commits into from
May 3, 2022

Conversation

zelinh
Copy link
Member

@zelinh zelinh commented May 2, 2022

Signed-off-by: Zelin Hao zelinhao@amazon.com

Description

Change the refs in the manifest to use tags.

Issues Resolved

Part of #1624

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
@zelinh zelinh mentioned this pull request May 2, 2022
51 tasks
@dblock
Copy link
Member

dblock commented May 3, 2022

We are going to continue building 2.0 off the 2.0 branch, so why this change?

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
@peterzhuamazon peterzhuamazon marked this pull request as ready for review May 3, 2022 20:04
@peterzhuamazon peterzhuamazon requested a review from a team as a code owner May 3, 2022 20:04
@zelinh
Copy link
Member Author

zelinh commented May 3, 2022

We are going to continue building 2.0 off the 2.0 branch, so why this change?

@dblock I will leave the current manifests for 2.0.0 GA and add a new 2.0.0-rc1 folder with tags.

@peterzhuamazon
Copy link
Member



BUILD SUCCESSFUL in 55s
7 actionable tasks: 7 executed
2022-05-03 20:13:56 INFO     Executing "./gradlew properties -Dopensearch.version=2.0.0-SNAPSHOT -Dbuild.snapshot=true" in /tmp/tmpvviv1nh3/common-utils
2022-05-03 20:13:59 ERROR    CI Manifest check failed
Traceback (most recent call last):
  File "./src/run_ci.py", line 25, in <module>
    sys.exit(main())
  File "./src/run_ci.py", line 21, in main
    CiManifests.from_file(args.manifest, args).check()
  File "/home/runner/work/opensearch-build/opensearch-build/src/ci_workflow/ci_manifest.py", line 21, in check
    self.__check__()
  File "/home/runner/work/opensearch-build/opensearch-build/src/ci_workflow/ci_input_manifest.py", line 41, in __check__
    ci_check_list.check()
  File "/home/runner/work/opensearch-build/opensearch-build/src/ci_workflow/ci_check_list_source.py", line 44, in check
    instance.check()
  File "/home/runner/work/opensearch-build/opensearch-build/src/ci_workflow/ci_check_gradle_properties_version.py", line 21, in check
    self.properties.check_value("version", self.checked_version)
  File "/home/runner/work/opensearch-build/opensearch-build/src/system/properties_file.py", line 49, in check_value
    raise PropertiesFile.UnexpectedKeyValueError(key, expected, value)
system.properties_file.UnexpectedKeyValueError: Expected to have version='2.0.0.0-SNAPSHOT', but was '2.0.0.0-rc1-SNAPSHOT'.

This is expected failure as 2.0.0 folder have manifests without qualifier for GA.
While many plugins still have their 2.0 branch on rc1 default qualifier.
https://github.com/opensearch-project/common-utils/blob/2.0/build.gradle#L11

Removing rc1 from 2.0 branch is an ongoing effort.

Thanks.

@peterzhuamazon
Copy link
Member

@bbarani bbarani merged commit adccbd9 into opensearch-project:main May 3, 2022
@peterzhuamazon peterzhuamazon deleted the change-ref-200rc1 branch May 3, 2022 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants