Skip to content

chore(QTDI-3566): Remove unused jira-credentials from Jenkins builds #1287

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

Open
acatoire wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore(QTDI-3566): Remove unused jira-credentials from Jenkins builds #1287

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
5 changes: 0 additions & 5 deletions .jenkins/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@
<username>${env.GITHUB_LOGIN}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
<server>
<id>jira</id>
<username>${env.JIRA_USER}</username>
<password>${env.JIRA_PASS}</password>
</server>
<server>
<id>jetbrains</id>
<username>${env.JETBRAINS_USER}</username>
Expand Down
7 changes: 1 addition & 6 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ final def jetbrainsCredentials = usernamePassword(
credentialsId: 'jetbrains-credentials',
usernameVariable: 'JETBRAINS_USER',
passwordVariable: 'JETBRAINS_PASS')
final def jiraCredentials = usernamePassword(
credentialsId: 'jira-credentials',
usernameVariable: 'JIRA_USER',
passwordVariable: 'JIRA_PASS')
final def gitCredentials = usernamePassword(
credentialsId: 'github-credentials',
usernameVariable: 'GITHUB_LOGIN',
Expand Down Expand Up @@ -424,7 +420,6 @@ pipeline {
dockerCredentials,
ossrhCredentials,
jetbrainsCredentials,
jiraCredentials,
gpgCredentials]) {
script {
sh """\
Expand Down Expand Up @@ -719,7 +714,7 @@ pipeline {
}
steps {
script {
withCredentials([gitCredentials, dockerCredentials, ossrhCredentials, jetbrainsCredentials, jiraCredentials, gpgCredentials, nexusCredentials]) {
withCredentials([gitCredentials, dockerCredentials, ossrhCredentials, jetbrainsCredentials, gpgCredentials, nexusCredentials]) {
configFileProvider([configFile(fileId: 'maven-settings-nexus-zl', variable: 'MAVEN_SETTINGS')]) {
sh """
bash .jenkins/scripts/release_legacy.sh $branch_name $finalVersion $extraBuildParams
Expand Down
7 changes: 0 additions & 7 deletions ci/Jenkinsfile-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ final def jetbrainsCredentials = usernamePassword(
credentialsId: 'jetbrains-credentials',
usernameVariable: 'JETBRAINS_USER',
passwordVariable: 'JETBRAINS_PASS')
final def jiraCredentials = usernamePassword(
credentialsId: 'jira-credentials',
usernameVariable: 'JIRA_USER',
passwordVariable: 'JIRA_PASS')
final def gitCredentials = usernamePassword(
credentialsId: 'github-credentials',
usernameVariable: 'GITHUB_LOGIN',
Expand Down Expand Up @@ -296,7 +292,6 @@ pipeline {
dockerCredentials,
ossrhCredentials,
jetbrainsCredentials,
jiraCredentials,
gpgCredentials]) {
script {
sh """\
Expand Down Expand Up @@ -451,7 +446,6 @@ pipeline {
withCredentials([nexusCredentials,
ossrhCredentials,
jetbrainsCredentials,
jiraCredentials,
gpgCredentials]) {

script {
Expand All @@ -469,7 +463,6 @@ pipeline {
steps {
withCredentials([nexusCredentials,
ossrhCredentials,
jiraCredentials,
gpgCredentials]) {

script {
Expand Down
2 changes: 0 additions & 2 deletions documentation/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,6 @@
<includePluginDependencies>true</includePluginDependencies>
<arguments>
<argument>${project.basedir}/src/main/antora/modules/ROOT/pages</argument>
<argument>${talend.jira.username}</argument>
<argument>${talend.jira.password}</argument>
<argument>${project.version}</argument>
<argument>offline=${settings.offline}</argument>
<argument>${talend.github.username}</argument>
Expand Down
3 changes: 1 addition & 2 deletions documentation/src/build/DecryptCredentials.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def decryptAndSet(name) {
def serverId = project.properties.getProperty("talend.${name}.serverId", name)
def serverIt = session.settings.servers.findAll { it.id == serverId }.iterator()
if (!serverIt.hasNext()) {
log.warn("no server '${serverId}' in your settings.xml, will skip changelog generation")
log.warn("no server '${serverId}' in your settings.xml, will skip contributors generation")
project.properties.setProperty("talend.${name}.username", 'skip')
project.properties.setProperty("talend.${name}.password", 'skip')
return
Expand All @@ -35,6 +35,5 @@ def decryptAndSet(name) {

}

decryptAndSet('jira')
decryptAndSet('github')

16 changes: 2 additions & 14 deletions documentation/src/main/antora/modules/ROOT/pages/release-process.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ Add the required credentials to your Maven `settings.xml` file for the release.
<username>${env.TLND_GITHUB_USER}</username>
<password>${env.TLND_GITHUB_PASSWORD}</password>
</server>
<server>
<id>jira</id>
<username>${env.TLND_JIRA_USER}</username>
<password>${env.TLND_JIRA_PASS}</password>
</server>
<server>
<id>jetbrains</id>
<username>${env.JETBRAINS_USER}</username>
Expand Down Expand Up @@ -83,15 +78,8 @@ NOTE: All the environment variables should be either set in your environment or
1. The OSSH variables are your Sonatype OSS repository credentials with the permissions to deploy on org.talend.
If you don't have them already, you can ask for them at https://issues.sonatype.org/projects/OSSRH using your Talend address.
2. The GitHub variables are your GitHub account credentials. they are mainly used to update the documentation.
3. The JIRA variables are your Talend account credentials with read permissions on https://jira.talendforge.org/projects/TCOMP/.
4. The Blackduck configuration is used for security scans.
5. The GPG variables reference the key mentioned in <<generate-gpg-key>>.

== Cleaning up JIRA

The release connects to JIRA to retrieve and create the release notes. It uses all `TCOMP` issues which have the `changelog` label.

Before any release, go through all the issues of the version to release and add or remove the `changelog` label depending on the issues that need to appear in the release notes.
3. The Blackduck configuration is used for security scans.
4. The GPG variables reference the key mentioned in <<generate-gpg-key>>.

== Releasing

Expand Down
Loading
Loading