Produced by Araxis Merge on 12/7/2018 11:36:09 AM Central Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\SCRUB\MHED\MHED\VAR 4.10.0\var-web-release-4.10@e10f18de1ef | Jenkinsfile-AWS | Mon Oct 22 23:25:20 2018 UTC |
| 2 | C:\MHED-scrubbed\MHED\MHED\VAR 4.10.0\var-web-release-4.10@e10f18de1ef | Jenkinsfile-AWS | Fri Dec 7 13:06:46 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 6 | 218 |
| Changed | 6 | 14 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | pipeline { | |
| 2 | agent { | |
| 3 | kubern etes { | |
| 4 | labe l 'var-web -image-bui ld' | |
| 5 | defa ultContain er 'ruby-n ode-grunt' | |
| 6 | yaml """ | |
| 7 | apiVersion : v1 | |
| 8 | kind: Pod | |
| 9 | metadata: | |
| 10 | labels: | |
| 11 | image- build: var -web-v4 | |
| 12 | spec: | |
| 13 | containe rs: | |
| 14 | - name: ruby-node- grunt | |
| 15 | image: uti lity.apps. DOMAIN . EX /base-imag es/ruby-no de-grunt:1 .0.1 | |
| 16 | env: | |
| 17 | - name : DOCKER_H OST | |
| 18 | valu e: tcp://l ocalhost:2 375 | |
| 19 | comman d: | |
| 20 | - cat | |
| 21 | tty: t rue | |
| 22 | - name: docker | |
| 23 | image: docker:1. 12.6 | |
| 24 | env: | |
| 25 | - name : DOCKER_H OST | |
| 26 | valu e: tcp://l ocalhost:2 375 | |
| 27 | comman d: | |
| 28 | - cat | |
| 29 | tty: t rue | |
| 30 | - name: dind-daemo n | |
| 31 | image: uti lity.apps. DOMAIN . EX /base-imag es/map-din d-image:1. 0.1 | |
| 32 | securi tyContext: | |
| 33 | priv ileged: tr ue | |
| 34 | ports: | |
| 35 | - cont ainerPort: 2375 | |
| 36 | volume Mounts: | |
| 37 | - name : docker-g raph-stora ge | |
| 38 | moun tPath: /va r/lib/dock er | |
| 39 | tty: t rue | |
| 40 | - name: k8-deploy | |
| 41 | image: uti lity.apps. DOMAIN . EX /base-imag es/k8-depl oy:1.0.4 | |
| 42 | comman d: | |
| 43 | - cat | |
| 44 | tty: t rue | |
| 45 | imagePul lSecrets: | |
| 46 | - name: map-dtr | |
| 47 | volumes: | |
| 48 | - name: docker-gra ph-storage | |
| 49 | emptyD ir: {} | |
| 50 | """ | |
| 51 | } | |
| 52 | } | |
| 53 | ||
| 54 | environm ent { | |
| 55 | SERV ICE_VERSIO N = '4.6.0 ' | |
| 56 | IMAG E = '/var/ var-web' | |
| 57 | DTR_URL = 'utility.a pps. DOMAIN . EX ' | |
| 58 | DTR_PREFIX = 'utilit y.apps. DOMAIN . EX ' | |
| 59 | DTR_ ORG = '/ba se-images' | |
| 60 | } | |
| 61 | ||
| 62 | ||
| 63 | stages { | |
| 64 | ||
| 65 | stage( 'App Build ') { | |
| 66 | step s { | |
| 67 | wi thCredenti als([strin g(credenti alsId: 'VA _NEXUS_PWD ', variabl e: 'VA_NEX US_PWD'), string(cre dentialsId : 'VA_NEXU S_USER', v ariable: ' VA_NEXUS_U SER'), str ing(creden tialsId: ' MAP_DTR_PW D', variab le: 'MAP_D TR_PWD'), string(cre dentialsId : 'MAP_DTR _USER', va riable: 'M AP_DTR_USE R')]) { | |
| 68 | containe r('ruby-no de-grunt') { | |
| 69 | sh './ build.sh' | |
| 70 | } | |
| 71 | } | |
| 72 | } | |
| 73 | } | |
| 74 | ||
| 75 | stage( 'Image Bui ld and Pus h') { | |
| 76 | step s { | |
| 77 | wi thCredenti als([strin g(credenti alsId: 'MA P_DTR_PWD' , variable : 'MAP_DTR _PWD'), st ring(crede ntialsId: 'MAP_DTR_U SER', vari able: 'MAP _DTR_USER' )]) { | |
| 78 | containe r('docker' ) { | |
| 79 | sh 'docker login -u $MAP_DTR_U SER -p $MA P_DTR_PWD utility.ap ps. DOMAIN . EX ' | |
| 80 | sh 'cd dist/ && docker bui ld -t $DTR _URL$IMAGE :$SERVICE_ VERSION .' | |
| 81 | sh 'do cker push $DTR_URL$I MAGE:$SERV ICE_VERSIO N' | |
| 82 | } | |
| 83 | } | |
| 84 | } | |
| 85 | } | |
| 86 | ||
| 87 | stage( 'Deploy to Staging') { | |
| 88 | ||
| 89 | en vironment { | |
| 90 | K8_API_A DDR = 'htt ps://inter nal-stagin g-kube-api -336601082 .us-gov-we st-1.elb.a mazonaws.c om:6443' | |
| 91 | VAMF_ENV IRONMENT = 'map-stag ing' | |
| 92 | VAULT_AD DR = 'http ://ip-172- 16-2-10.us -gov-west- 1.compute. internal:8 200' | |
| 93 | CONSUL_A DDR = 'ip- 172-16-2-1 1.us-gov-w est-1.comp ute.intern al:8500' | |
| 94 | SECRET_P ATH = 'sec ret/map-st aging/depl oy' | |
| 95 | CONSUL_P ATH = 'app config/map -staging/d eploy' | |
| 96 | NAMESPAC E = 'defau lt' | |
| 97 | } | |
| 98 | ||
| 99 | st eps { | |
| 100 | withCred entials([s tring(cred entialsId: 'CONSUL_M ASTER_TOKE N', variab le: 'CONSU L_TOKEN')] ) { | |
| 101 | cont ainer('k8- deploy') { | |
| 102 | sh 'echo " Deploying $DTR_URL$I MAGE:$VERS ION"' | |
| 103 | sh '/entry point.sh' | |
| 104 | } | |
| 105 | } | |
| 106 | } | |
| 107 | } | |
| 108 | ||
| 109 | } | |
| 110 | ||
| 111 | post { | |
| 112 | always { | |
| 113 | clea nWs() /* c lean up ou r workspac e */ | |
| 114 | } | |
| 115 | } | |
| 116 | }TTTTTT |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.