Skip to content

Commit e86e41d

Browse files
authored
* Detach GHA and Jenkins
1 parent 571fcdc commit e86e41d

File tree

5 files changed

+0
-103
lines changed

5 files changed

+0
-103
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,39 +1047,6 @@ jobs:
10471047
DEST: s3://${{ matrix.deploy-bucket }}
10481048
ASSET_DEST: s3://${{ matrix.asset-bucket }}
10491049

1050-
jenkins:
1051-
name: Run Jenkins CI
1052-
runs-on: ubuntu-latest
1053-
steps:
1054-
- name: Configure AWS credentials
1055-
uses: aws-actions/configure-aws-credentials@v1
1056-
with:
1057-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
1058-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1059-
aws-region: us-gov-west-1
1060-
1061-
- name: Get Jenkins token
1062-
uses: marvinpinto/action-inject-ssm-secrets@latest
1063-
with:
1064-
ssm_parameter: /frontend-team/github-actions/parameters/JENKINS_API_TOKEN
1065-
env_variable_name: JENKINS_API_TOKEN
1066-
1067-
- name: Checkout
1068-
uses: actions/checkout@v2
1069-
1070-
- name: Install dependencies
1071-
uses: ./.github/workflows/install
1072-
timeout-minutes: 30
1073-
with:
1074-
key: ${{ hashFiles('yarn.lock') }}
1075-
yarn_cache_folder: .cache/yarn
1076-
path: |
1077-
.cache/yarn
1078-
node_modules
1079-
1080-
- name: Trigger Jenkins pipeline
1081-
run: node script/github-actions/trigger-jenkins.js
1082-
10831050
notify-failure:
10841051
name: Notify Failure
10851052
runs-on: ubuntu-latest

Jenkinsfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,6 @@ node('vetsgov-general-purpose') {
99
defaultValue: true,
1010
description: "Hack to cancel the run triggered by webhook")])]);
1111

12-
stage('Cancel') {
13-
if (params.cancelBuild) {
14-
currentBuild.result = 'ABORTED'
15-
error("Aborting run triggered by webhook. Please wait for the run triggered by the GitHub Actions workflow.");
16-
}
17-
}
18-
1912
// Checkout vets-website code
2013
dir("vets-website") {
2114
checkout scm

jenkins/common.groovy

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,6 @@ def setup() {
4040
sh "mkdir -p temp"
4141

4242
dockerImage = docker.build(DOCKER_TAG)
43-
retry(5) {
44-
dockerImage.inside(DOCKER_ARGS) {
45-
sh "cd /application && rm -rf node_modules && yarn install --frozen-lockfile --production=false"
46-
}
47-
}
4843
return dockerImage
4944
}
5045
}

script/github-actions/trigger-jenkins.js

Lines changed: 0 additions & 57 deletions
This file was deleted.

script/review-entrypoint.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ cp .env.example .env && yarn install --production=false
1111
npm run fetch-drupal-cache
1212
npm run build -- --buildtype=localhost --api='${API_URL}' --host='${WEB_HOST}' --port='${WEB_PORT}' --apps-directory-name=application
1313
npm run heroku-serve -- build/localhost -p 3002
14-

0 commit comments

Comments
 (0)