diff --git a/Jenkinsfile b/Jenkinsfile index 1ae9dc9..c865e3f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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' @@ -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 { @@ -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') { @@ -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') } - } } } } diff --git a/README.md b/README.md index 7337f07..1c04178 100644 --- a/README.md +++ b/README.md @@ -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/). @@ -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 = { @@ -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