Skip to content

Commit 8499e94

Browse files
authored
Merge pull request #1 from scribd/edoardor/SERF-800/make-jenkinsfile-github-compatible
[SERF-800] Make Jenkinsfile GitHub compatible
2 parents c3ce624 + 81269d8 commit 8499e94

File tree

2 files changed

+4
-36
lines changed

2 files changed

+4
-36
lines changed

Jenkinsfile

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@ pipeline {
1111
options {
1212
ansiColor('xterm')
1313
timeout(30)
14-
gitLabConnection('GitLab')
1514
buildDiscarder logRotator(numToKeepStr: '128')
1615
}
1716

18-
triggers {
19-
gitlab(triggerOnPush: true, triggerOnMergeRequest: true, branchFilterType: 'All')
20-
}
21-
2217
environment {
2318
// https://www.terraform.io/docs/commands/environment-variables.html#tf_in_automation
2419
TF_IN_AUTOMATION = 'true'
@@ -27,8 +22,6 @@ pipeline {
2722
//
2823
// https://github.com/hashicorp/terraform/issues/21408#issuecomment-495746582
2924
AWS_DEFAULT_REGION = 'us-east-2'
30-
31-
GITLAB_TOKEN = credentials('tf-scribdbot-gitlab-token')
3225
}
3326

3427
stages {
@@ -37,44 +30,24 @@ pipeline {
3730
// Skips a build if a commit message contains "[skip ci]"
3831
scmSkip(deleteBuild: true, skipPattern: '.*\\[skip ci\\].*')
3932
}
40-
41-
post {
42-
failure { updateGitlabCommitStatus(name: 'build:skip', state: 'failed') }
43-
success { updateGitlabCommitStatus(name: 'build:skip', state: 'success') }
44-
}
4533
}
4634

4735
stage('init') {
4836
steps {
4937
sh("terraform init -input=false")
5038
}
51-
52-
post {
53-
failure { updateGitlabCommitStatus(name: 'terraform:init', state: 'failed') }
54-
success { updateGitlabCommitStatus(name: 'terraform:init', state: 'success') }
55-
}
5639
}
5740

5841
stage('check:format') {
5942
steps {
6043
sh('terraform fmt -check -diff -recursive')
6144
}
62-
63-
post {
64-
failure { updateGitlabCommitStatus(name: 'terraform:check:format', state: 'failed') }
65-
success { updateGitlabCommitStatus(name: 'terraform:check:format', state: 'success') }
66-
}
6745
}
6846

6947
stage('validate') {
7048
steps {
7149
sh('terraform validate')
7250
}
73-
74-
post {
75-
failure { updateGitlabCommitStatus(name: 'terraform:validate', state: 'failed') }
76-
success { updateGitlabCommitStatus(name: 'terraform:validate', state: 'success') }
77-
}
7851
}
7952

8053
stage('release') {
@@ -99,11 +72,6 @@ pipeline {
9972
steps {
10073
sh('npx semantic-release')
10174
}
102-
103-
post {
104-
failure { updateGitlabCommitStatus(name: 'terraform:release', state: 'failed') }
105-
success { updateGitlabCommitStatus(name: 'terraform:release', state: 'success') }
106-
}
10775
}
10876
}
10977
}

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# terraform-aws-secrets
1+
# terraform-aws-app-secrets
22

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

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

2222
```hcl
2323
module "secrets" {
24-
source = "git::ssh://git@git.lo/terraform/terraform-aws-secrets.git?ref=main"
24+
source = "git::ssh://git@github.com/scribdterraform-aws-app-secrets.git?ref=main"
2525
2626
app_name = "go-chassis"
2727
secrets = {
@@ -74,13 +74,13 @@ Releases are done from the `origin/main` branch using a manual step at the end o
7474
In order to create a new release:
7575

7676
1. Merge / push changes to `origin/main`
77-
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)
77+
2. Open the `origin/main` [Jenkins CI/CD pipeline](https://jenkins.private.scribd.com/job/Service%20Foundations/job/terraform-aws-app-secrets/job/main/)
7878
3. Click "Proceed" button on the release step
7979

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

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

8585
## Maintainers
8686

0 commit comments

Comments
 (0)