Skip to content

[SERF-800] Make Jenkinsfile GitHub compatible #1

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
terranisu merged 2 commits into from
Jan 20, 2021
Merged

[SERF-800] Make Jenkinsfile GitHub compatible #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07c3fa3
chore(ci): Remove the connection settings to GitLab
Jan 20, 2021
81269d8
chore: Update README
Jan 20, 2021
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
32 changes: 0 additions & 32 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,9 @@ pipeline {
options {
ansiColor('xterm')
timeout(30)
gitLabConnection('GitLab')
buildDiscarder logRotator(numToKeepStr: '128')
}

triggers {
gitlab(triggerOnPush: true, triggerOnMergeRequest: true, branchFilterType: 'All')
}

environment {
// https://www.terraform.io/docs/commands/environment-variables.html#tf_in_automation
TF_IN_AUTOMATION = 'true'
Expand All @@ -27,8 +22,6 @@ pipeline {
//
// https://github.com/hashicorp/terraform/issues/21408#issuecomment-495746582
AWS_DEFAULT_REGION = 'us-east-2'

GITLAB_TOKEN = credentials('tf-scribdbot-gitlab-token')
}

stages {
Expand All @@ -37,44 +30,24 @@ pipeline {
// Skips a build if a commit message contains "[skip ci]"
scmSkip(deleteBuild: true, skipPattern: '.*\\[skip ci\\].*')
}

post {
failure { updateGitlabCommitStatus(name: 'build:skip', state: 'failed') }
success { updateGitlabCommitStatus(name: 'build:skip', state: 'success') }
}
}

stage('init') {
steps {
sh("terraform init -input=false")
}

post {
failure { updateGitlabCommitStatus(name: 'terraform:init', state: 'failed') }
success { updateGitlabCommitStatus(name: 'terraform:init', state: 'success') }
}
}

stage('check:format') {
steps {
sh('terraform fmt -check -diff -recursive')
}

post {
failure { updateGitlabCommitStatus(name: 'terraform:check:format', state: 'failed') }
success { updateGitlabCommitStatus(name: 'terraform:check:format', state: 'success') }
}
}

stage('validate') {
steps {
sh('terraform validate')
}

post {
failure { updateGitlabCommitStatus(name: 'terraform:validate', state: 'failed') }
success { updateGitlabCommitStatus(name: 'terraform:validate', state: 'success') }
}
}

stage('release') {
Expand All @@ -99,11 +72,6 @@ pipeline {
steps {
sh('npx semantic-release')
}

post {
failure { updateGitlabCommitStatus(name: 'terraform:release', state: 'failed') }
success { updateGitlabCommitStatus(name: 'terraform:release', state: 'success') }
}
}
}
}
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# terraform-aws-secrets
# terraform-aws-app-secrets

A module to create application secrets stored in [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/).

Expand All @@ -21,7 +21,7 @@ A module to create application secrets stored in [AWS Secrets Manager](https://a

```hcl
module "secrets" {
source = "git::ssh://git@git.lo/terraform/terraform-aws-secrets.git?ref=main"
source = "git::ssh://git@github.com/scribdterraform-aws-app-secrets.git?ref=main"

app_name = "go-chassis"
secrets = {
Expand Down Expand Up @@ -74,13 +74,13 @@ Releases are done from the `origin/main` branch using a manual step at the end o
In order to create a new release:

1. Merge / push changes to `origin/main`
2. Open the `origin/main` [Jenkins CI/CD pipeline](https://jenkins.kube-charlie.lo/blue/organizations/jenkins/Terraform%2Fterraform%252Fterraform-aws-secrets/activity/?branch=main)
2. Open the `origin/main` [Jenkins CI/CD pipeline](https://jenkins.private.scribd.com/job/Service%20Foundations/job/terraform-aws-app-secrets/job/main/)
3. Click "Proceed" button on the release step

A version bump will happen automatically and the type of version bump
(patch, minor, major) depends on the commits introduced since the last release.

The `semantic-release` configuration is in [`.releaserc.yml`](https://git.lo/terraform/terraform-aws-secrets/blob/main/.releaserc.yml).
The `semantic-release` configuration is in [`.releaserc.yml`](https://github.com/scribd/terraform-aws-app-secrets/blob/main/.releaserc.yml).

## Maintainers

Expand Down