Skip to content

Commit

Permalink
Merge branch 'opensearch-project:main' into validation
Browse files Browse the repository at this point in the history
  • Loading branch information
Divyaasm authored Nov 14, 2022
2 parents 9011dc0 + 97548a3 commit e7e500d
Show file tree
Hide file tree
Showing 147 changed files with 3,727 additions and 701 deletions.
1 change: 0 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ coverage:
ignore:
- '**/tests/*.py'
- '**/test/*.js'
- '**/test/*.ts'
64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/plugin_onboarding_template.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
name: On-board plugins
description: On-board plugins
title: '[On-boarding]: '
labels: [on-boarding, untriaged]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to submit on-boarding request!
- type: textarea
attributes:
description: 'Provide the name link of your plugin'
label: 'What is the name of your plugin?'
id: plugin-name
validations:
required: true
- type: textarea
attributes:
description: 'Provide the GitHub link for your repository'
label: 'What is the link to your GitHub repo?'
id: Github-link
validations:
required: true
- type: textarea
attributes:
description: 'What is the targeted OpenSearch release version for this plugin?'
label: 'Targeted release version'
id: expected-release-version
validations:
required: true
- type: textarea
attributes:
description: 'Is this OpenSearch, OpenSearch-dashboards plugin?'
label: 'What type of the plugin are we on-boarding?'
id: Type
validations:
required: true
- type: textarea
attributes:
description: 'Does this plugin have necessary scripts to invoke integration and BWC tests?'
label: 'Does this plugin has all the necessary automated tests?'
id: tests
validations:
required: true
- type: textarea
attributes:
description: 'Confirm that all the necessary reviews for this component has been completed.'
label: 'Have you completed the required reviews including Security reviews, UX reviews?'
id: reviews
validations:
required: true
- type: textarea
attributes:
description: 'Do we need to enable any automated CVE scanning on this repo?'
label: 'Have you on-boarded automated security scanning for the GitHub repo associated with this plugin?'
id: repo-scanning
validations:
required: true
- type: textarea
attributes:
description: 'Add any additional context along with contact details for this component here.'
label: 'Additional context'
id: additional-context
72 changes: 72 additions & 0 deletions .github/ISSUE_TEMPLATE/standalone_releases_template.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
---
name: Release standalone components
description: Standalone components release template
title: '[release]: '
labels: [release, untriaged]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to submit release request!
-
attributes:
description: 'Provide the name of your component'
label: 'What is the name of your component?'
id: component-name
type: textarea
validations:
required: true
-
attributes:
description: 'Provide the GitHub link for your repository'
label: 'What is the link to your GitHub repo?'
id: Github-link
type: textarea
validations:
required: true
-
attributes:
description: 'What is the targeted date for the release?'
label: 'Targeted release date'
id: expected-release-date
type: textarea
validations:
required: true
-
attributes:
description: 'Does this component need to be published to specific distribution channel(s) like pypi, npm, Docker etc..?'
label: 'Where should we publish this component?'
id: Type
type: textarea
validations:
required: true
-
attributes:
description: 'Please list the aftifact types along with any other additional information related to generated artifacts?'
label: 'What type of artifact(s) will be generated for this component?'
id: tests
type: textarea
validations:
required: true
-
attributes:
description: 'Confirm that all the necessary reviews for this component has been completed.'
label: 'Have you completed the required reviews including security reviews, UX reviews?'
id: reviews
type: textarea
validations:
required: true
-
attributes:
description: 'Do we need to enable any automated CVE scanning on this repo?'
label: 'Have you on-boarded automated security scanning for the GitHub repo associated with this component?'
id: repo-scanning
type: textarea
validations:
required: true
-
attributes:
description: 'Add any additional context along with contact details for this component here.'
label: 'Additional context'
id: additional-context
type: textarea
22 changes: 22 additions & 0 deletions DEVELOPER_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,29 @@ Each jenkins library should have a test case associated with it. Eg: [TestSignAr
- Jenkins' library test should extend [BuildPipelineTest.groovy](tests/jenkins/BuildPipelineTest.groovy)
- Create a dummy job such as [Hello_Jenkinsfile](tests/jenkins/jobs/Hello_Jenkinsfile) to call and test the function
and output [Hello_Jenkinsfile.txt](tests/jenkins/jobs/Hello_Jenkinsfile.txt)
- If using remote libs from [opensearch-build-libraries](https://github.com/opensearch-project/opensearch-build-libraries) repository with tag (ex: 1.0.0), make sure
both the Jenkins Test file as well as the Jenkins Job file are overriding the libs version with the same tag (ex: 1.0.0), or Jacoco test will fail to generate reports.
This would happen if defaultVersion in BuildPipelineTest.groovy (default to 'main') have a different HEAD commit id compares to tag commit id you defined to use.
```
super.setUp()
......
helper.registerSharedLibrary(
library().name('jenkins')
.defaultVersion('1.0.0')
.allowOverride(true)
.implicit(true)
.targetPath('vars')
.retriever(gitSource('https://github.com/opensearch-project/opensearch-build-libraries.git'))
.build()
)
```

```
lib = library(identifier: '[email protected]', retriever: modernSCM([
$class: 'GitSCMSource',
remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
]))
```

#### Testing in Jenkins
* [Build_OpenSearch_Dashboards_Jenkinsfile](tests/jenkins/jobs/Build_OpenSearch_Dashboards_Jenkinsfile): is similar to [OpenSearch Dashboards Jenkinsfile](jenkins/opensearch-dashboards/Jenkinsfile) w/o notifications.
Expand Down
16 changes: 9 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.9', ext: 'pom'
implementation group: 'com.cloudbees', name: 'groovy-cps', version: '1.31'
testImplementation group: 'org.yaml', name: 'snakeyaml', version: '1.32'
testImplementation group: 'org.yaml', name: 'snakeyaml', version: '1.33'
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.4.1'
testImplementation group: 'com.lesfurets', name:'jenkins-pipeline-unit', version: '1.13'
}
Expand All @@ -40,7 +40,7 @@ configurations.all {
resolutionStrategy {
force group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
force group: 'commons-codec', name: 'commons-codec', version: '1.15'
force group: 'com.google.protobuf', name: 'protobuf-java', version: '3.19.3'
force group: 'com.google.protobuf', name: 'protobuf-java', version: '3.21.7'
}
}

Expand All @@ -63,15 +63,17 @@ sharedLibrary {
coreVersion = '2.364' // https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-core/
testHarnessVersion = '1736.vc72c458c5103' // https://mvnrepository.com/artifact/org.jenkins-ci.main/jenkins-test-harness?repo=jenkins-releases
pluginDependencies {
workflowCpsGlobalLibraryPluginVersion = '570.v21311f4951f8' // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/workflow/workflow-cps-global-lib/
// https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/workflow/workflow-cps-global-lib/
// Need to migrate to pipeline-groovy-lib later as workflow-cps-global-lib is deprecated now.
workflowCpsGlobalLibraryPluginVersion = '588.v576c103a_ff86'
// see https://mvnrepository.com/artifact/org.jenkins-ci.plugins/<name>?repo=jenkins-releases for latest
dependency('org.jenkins-ci.plugins.workflow', 'workflow-cps', '2.94.1')
dependency('org.jenkins-ci.plugins.workflow', 'workflow-multibranch', '2.26.1')
dependency('org.jenkins-ci.plugins', 'pipeline-input-step', '449.v77f0e8b_845c4') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/pipeline-input-step/
dependency('org.jenkins-ci.plugins', 'script-security', '1172.v35f6a_0b_8207e')
dependency('org.jenkins-ci.plugins', 'pipeline-input-step', '456.vd8a_957db_5b_e9') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/pipeline-input-step/
dependency('org.jenkins-ci.plugins', 'script-security', '1184.v85d16b_d851b_3')
dependency('org.jenkins-ci.plugins', 'credentials', '1112.vc87b_7a_3597f6')
dependency('org.jenkins-ci.plugins', 'git-client', '3.11.1')
dependency('org.jenkins-ci.plugins', 'junit', '1.55')
dependency('org.jenkins-ci.plugins', 'junit', '1143.v8d9a_e3355270')
dependency('org.jenkins-ci.plugins', 'mailer', '408.vd726a_1130320') // https://repo.jenkins-ci.org/public/org/jenkins-ci/plugins/mailer/
}
}
Expand Down Expand Up @@ -117,4 +119,4 @@ jacocoTestReport {
reports {
xml.required = true
}
}
}
File renamed without changes.
Loading

0 comments on commit e7e500d

Please sign in to comment.