Skip to content

Enable CD on plugin-compat-tester & clean up obsolete modules #2103

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

Merged
oleg-nenashev merged 1 commit into from
Oct 17, 2021
Merged

Enable CD on plugin-compat-tester & clean up obsolete modules #2103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions permissions/component-plugins-compat-tester-aggregator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: "plugins-compat-tester-aggregator"
github: "jenkinsci/plugin-compat-tester"
paths:
- "org/jenkins-ci/tests/plugins-compat-tester-aggregator"
cd:
Copy link
Member

@timja timja Sep 28, 2021

Choose a reason for hiding this comment

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

needs to be combined in one file for multi module to work iirc

Copy link
Contributor Author

@jglick jglick Sep 28, 2021

Choose a reason for hiding this comment

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

Mm, maybe. #1747. @daniel-beck any idea? Would it suffice as a workaround to just add a cd section to one component file?

Copy link
Contributor Author

@jglick jglick Sep 28, 2021

Choose a reason for hiding this comment

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

https://ci.jenkins.io/job/Infra/job/repository-permissions-updater/job/PR-2103/1/artifact/json/cd.index.json looks OK.

Copy link
Contributor Author

@jglick jglick Sep 28, 2021

Choose a reason for hiding this comment

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

While

repository-permissions-updater/src/main/groovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy

Lines 89 to 95 in fe278d5

List<Definition> definitions = cdEnabledComponentsByGitHub[definition.github]
if (!definitions) {
definitions = new ArrayList<>()
cdEnabledComponentsByGitHub[definition.github] = definitions
}
LOGGER.log(Level.INFO, "CD-enabled component '${definition.name}' in repository '${definition.github}'")
definitions.add(definition)
captures each YAML file associated with a given repo and cd.enabled, it seems from

repository-permissions-updater/src/main/groovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy

Lines 222 to 236 in fe278d5

cdEnabledComponentsByGitHub.each { githubRepo, components ->
def groupName = ArtifactoryAPI.getInstance().toGeneratedGroupName(githubRepo)
File outputFile = new File(new File(apiOutputDir, 'groups'), groupName + '.json')
JsonBuilder json = new JsonBuilder()
json {
name groupName
description "CD group with permissions to deploy from ${githubRepo}"
}
String pretty = json.toPrettyString()
outputFile.parentFile.mkdirs()
outputFile.text = pretty
}
and

repository-permissions-updater/src/main/groovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy

Line 247 in fe278d5

cdRepos(cdEnabledComponentsByGitHub.keySet().toList())
that the values are actually unused. IOW it should not even matter—so long as at least one file related to this repo enables CD, we should get the right user and secrets created—though it would have been clearer for

repository-permissions-updater/src/main/groovy/io/jenkins/infra/repository_permissions_updater/ArtifactoryPermissionsUpdater.groovy

Line 61 in fe278d5

Map<String, List<Definition>> cdEnabledComponentsByGitHub = new TreeMap<>()
to be a TreeSet<String>.

enabled: true
developers:
- "kwhetstone"
- "jglick"
Expand Down
2 changes: 2 additions & 0 deletions permissions/component-plugins-compat-tester-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: "plugins-compat-tester-cli"
github: "jenkinsci/plugin-compat-tester"
paths:
- "org/jenkins-ci/tests/plugins-compat-tester-cli"
cd:
enabled: true
Copy link
Contributor Author

@jglick jglick Nov 23, 2021

Choose a reason for hiding this comment

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

Note jenkinsci/plugin-compat-tester#320 (comment): could perhaps omit CD on the other modules, or if jenkinsci/plugin-compat-tester#320 is merged, simply remove the other modules from RPU altogether (would only ever be installed locally).

developers:
- "kwhetstone"
- "jglick"
Expand Down
11 changes: 0 additions & 11 deletions permissions/component-plugins-compat-tester-gae-client.yml
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions permissions/component-plugins-compat-tester-gae.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions permissions/component-plugins-compat-tester-model.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: "plugins-compat-tester-model"
github: "jenkinsci/plugin-compat-tester"
paths:
- "org/jenkins-ci/tests/plugins-compat-tester-model"
cd:
enabled: true
developers:
- "kwhetstone"
- "jglick"
Expand Down
2 changes: 2 additions & 0 deletions permissions/component-plugins-compat-tester.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: "plugins-compat-tester"
github: "jenkinsci/plugin-compat-tester"
paths:
- "org/jenkins-ci/tests/plugins-compat-tester"
cd:
enabled: true
developers:
- "kwhetstone"
- "jglick"
Expand Down