Produced by Araxis Merge on 4/18/2019 5:55:27 PM Eastern Daylight 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 | MCCF_EDI_TAS_TASCore v2.0_Build_10.zip\MCCF_EDI_TAS_DevOps\mccf_devops\roles\mccf_jenkins_sync_config\jobs\MaintenanceTasks\jobs\MCCF_JENKINS_REPO_monitor | config.xml | Wed Apr 3 02:27:54 2019 UTC |
2 | MCCF_EDI_TAS_TASCore v2.0_Build_10.zip\MCCF_EDI_TAS_DevOps\mccf_devops\roles\mccf_jenkins_sync_config\jobs\MaintenanceTasks\jobs\MCCF_JENKINS_REPO_monitor | config.xml | Tue Apr 16 15:27:28 2019 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 658 |
Changed | 1 | 2 |
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 | <?xml | |
2 | version='1 .1' | |
3 | encoding=' UTF-8' | |
4 | ?> | |
5 | <project> | |
6 | ||
7 | <actions/> | |
8 | ||
9 | <descripti on> | |
10 | Monitor yu m repo for changes | |
11 | </descript ion> | |
12 | ||
13 | <keepDepen dencies> | |
14 | false | |
15 | </keepDepe ndencies> | |
16 | ||
17 | <propertie s> | |
18 | ||
19 | <jenkins.m odel.Build DiscarderP roperty> | |
20 | ||
21 | <strategy | |
22 | class="hud son.tasks. LogRotator " | |
23 | > | |
24 | ||
25 | <daysToKee p> | |
26 | 5 | |
27 | </daysToKe ep> | |
28 | ||
29 | <numToKeep > | |
30 | 5 | |
31 | </numToKee p> | |
32 | ||
33 | <artifactD aysToKeep> | |
34 | -1 | |
35 | </artifact DaysToKeep > | |
36 | ||
37 | <artifactN umToKeep> | |
38 | 5 | |
39 | </artifact NumToKeep> | |
40 | ||
41 | </strategy > | |
42 | ||
43 | </jenkins. model.Buil dDiscarder Property> | |
44 | ||
45 | </properti es> | |
46 | ||
47 | <scm | |
48 | class="hud son.plugin s.git.GitS CM" | |
49 | plugin="gi t@4.0.0-rc " | |
50 | > | |
51 | ||
52 | <configVer sion> | |
53 | 2 | |
54 | </configVe rsion> | |
55 | ||
56 | <userRemot eConfigs> | |
57 | ||
58 | <hudson.pl ugins.git. UserRemote Config> | |
59 | ||
60 | <url> | |
61 | https://bi tbucket.or g/halfaker /mccf_jenk ins.git | |
62 | </url> | |
63 | ||
64 | <credentia lsId> | |
65 | jenkins_bu ild | |
66 | </credenti alsId> | |
67 | ||
68 | </hudson.p lugins.git .UserRemot eConfig> | |
69 | ||
70 | </userRemo teConfigs> | |
71 | ||
72 | <branches> | |
73 | ||
74 | <hudson.pl ugins.git. BranchSpec > | |
75 | ||
76 | <name> | |
77 | */master | |
78 | </name> | |
79 | ||
80 | </hudson.p lugins.git .BranchSpe c> | |
81 | ||
82 | </branches > | |
83 | ||
84 | <doGenerat eSubmodule Configurat ions> | |
85 | false | |
86 | </doGenera teSubmodul eConfigura tions> | |
87 | ||
88 | <submodule Cfg | |
89 | class="lis t" | |
90 | /> | |
91 | ||
92 | <extension s/> | |
93 | ||
94 | </scm> | |
95 | ||
96 | <canRoam> | |
97 | true | |
98 | </canRoam> | |
99 | ||
100 | <disabled> | |
101 | false | |
102 | </disabled > | |
103 | ||
104 | <blockBuil dWhenDowns treamBuild ing> | |
105 | false | |
106 | </blockBui ldWhenDown streamBuil ding> | |
107 | ||
108 | <blockBuil dWhenUpstr eamBuildin g> | |
109 | false | |
110 | </blockBui ldWhenUpst reamBuildi ng> | |
111 | ||
112 | <triggers> | |
113 | ||
114 | <org.jenki nsci.plugi ns.fstrigg er.trigger s.FolderCo ntentTrigg er | |
115 | plugin="fs trigger@0. 39" | |
116 | > | |
117 | ||
118 | <spec> | |
119 | H/30 8-20 * * 1-5 | |
120 | </spec> | |
121 | ||
122 | <path> | |
123 | /var/www/h tml/pub/re po/jenkins | |
124 | </path> | |
125 | ||
126 | <excludeCh eckLastMod ificationD ate> | |
127 | false | |
128 | </excludeC heckLastMo dification Date> | |
129 | ||
130 | <excludeCh eckContent > | |
131 | false | |
132 | </excludeC heckConten t> | |
133 | ||
134 | <excludeCh eckFewerOr MoreFiles> | |
135 | false | |
136 | </excludeC heckFewerO rMoreFiles > | |
137 | ||
138 | </org.jenk insci.plug ins.fstrig ger.trigge rs.FolderC ontentTrig ger> | |
139 | ||
140 | </triggers > | |
141 | ||
142 | <concurren tBuild> | |
143 | false | |
144 | </concurre ntBuild> | |
145 | ||
146 | <builders> | |
147 | ||
148 | <hudson.ta sks.Shell> | |
149 | ||
150 | <command> | |
151 | echo & quot;get / var/www/ht ml/pub/rep o/jenkins/ " | |
152 | rsync -avzh --ex clude .git --exclude *.sh --de l /var/www /html/pub/ repo/jenki ns/ . | |
153 | ||
154 | echo & quot;updat e git with added, mo dified, an d deleted files" ; | |
155 | git ad d -A . | |
156 | ||
157 | echo & quot;set t he user.na me" | |
158 | git co nfig user. name " ;lbenhart& quot; | |
159 | git config user.emai l " PII " | |
160 | ||
161 | echo & quot;commi t git jenk ins-${JOB_ BASE_NAME} -${BUILD_N UMBER}-${H OSTNAME}&q uot; | |
162 | git di ff --quiet && ; git diff --staged --quiet || git commi t -m " ;jenkins-$ {JOB_BASE_ NAME}-${BU ILD_NUMBER }-${HOSTNA ME}" | |
163 | ||
164 | echo & quot;cache credentia ls 'c ache --tim eout 600&a pos;" | |
165 | git co nfig --glo bal creden tial.helpe r 'ca che --time out 600&ap os; | |
166 | ||
167 | echo & quot;list git remote s" | |
168 | git ls -remote ht tps://${JE NKINS_CRED }@bitbucke t.org/half aker/mccf_ jenkins.gi t | |
169 | ||
170 | echo & quot;push changes to remote&qu ot; | |
171 | git co nfig push. default si mple | |
172 | git pu sh origin HEAD:maste r | |
173 | </command> | |
174 | ||
175 | </hudson.t asks.Shell > | |
176 | ||
177 | </builders > | |
178 | ||
179 | <publisher s> | |
180 | ||
181 | <hudson.pl ugins.git. GitPublish er | |
182 | plugin="gi t@4.0.0-rc " | |
183 | > | |
184 | ||
185 | <configVer sion> | |
186 | 2 | |
187 | </configVe rsion> | |
188 | ||
189 | <pushMerge > | |
190 | false | |
191 | </pushMerg e> | |
192 | ||
193 | <pushOnlyI fSuccess> | |
194 | true | |
195 | </pushOnly IfSuccess> | |
196 | ||
197 | <forcePush > | |
198 | false | |
199 | </forcePus h> | |
200 | ||
201 | <tagsToPus h> | |
202 | ||
203 | <hudson.pl ugins.git. GitPublish er_-TagToP ush> | |
204 | ||
205 | <targetRep oName> | |
206 | origin | |
207 | </targetRe poName> | |
208 | ||
209 | <tagName> | |
210 | ${JOB_BASE _NAME}-${B UILD_NUMBE R} | |
211 | </tagName> | |
212 | ||
213 | <tagMessag e> | |
214 | </tagMessa ge> | |
215 | ||
216 | <createTag > | |
217 | true | |
218 | </createTa g> | |
219 | ||
220 | <updateTag > | |
221 | false | |
222 | </updateTa g> | |
223 | ||
224 | </hudson.p lugins.git .GitPublis her_-TagTo Push> | |
225 | ||
226 | </tagsToPu sh> | |
227 | ||
228 | </hudson.p lugins.git .GitPublis her> | |
229 | ||
230 | <hudson.pl ugins.ws__ cleanup.Ws Cleanup | |
231 | plugin="ws -cleanup@0 .37" | |
232 | > | |
233 | ||
234 | <patterns | |
235 | class="emp ty-list" | |
236 | /> | |
237 | ||
238 | <deleteDir s> | |
239 | false | |
240 | </deleteDi rs> | |
241 | ||
242 | <skipWhenF ailed> | |
243 | false | |
244 | </skipWhen Failed> | |
245 | ||
246 | <cleanWhen Success> | |
247 | true | |
248 | </cleanWhe nSuccess> | |
249 | ||
250 | <cleanWhen Unstable> | |
251 | true | |
252 | </cleanWhe nUnstable> | |
253 | ||
254 | <cleanWhen Failure> | |
255 | true | |
256 | </cleanWhe nFailure> | |
257 | ||
258 | <cleanWhen NotBuilt> | |
259 | true | |
260 | </cleanWhe nNotBuilt> | |
261 | ||
262 | <cleanWhen Aborted> | |
263 | true | |
264 | </cleanWhe nAborted> | |
265 | ||
266 | <notFailBu ild> | |
267 | false | |
268 | </notFailB uild> | |
269 | ||
270 | <cleanupMa trixParent > | |
271 | false | |
272 | </cleanupM atrixParen t> | |
273 | ||
274 | <externalD elete> | |
275 | </external Delete> | |
276 | ||
277 | <disableDe ferredWipe out> | |
278 | false | |
279 | </disableD eferredWip eout> | |
280 | ||
281 | </hudson.p lugins.ws_ _cleanup.W sCleanup> | |
282 | ||
283 | </publishe rs> | |
284 | ||
285 | <buildWrap pers> | |
286 | ||
287 | <hudson.pl ugins.ws__ cleanup.Pr eBuildClea nup | |
288 | plugin="ws -cleanup@0 .37" | |
289 | > | |
290 | ||
291 | <deleteDir s> | |
292 | false | |
293 | </deleteDi rs> | |
294 | ||
295 | <cleanupPa rameter> | |
296 | </cleanupP arameter> | |
297 | ||
298 | <externalD elete> | |
299 | </external Delete> | |
300 | ||
301 | <disableDe ferredWipe out> | |
302 | false | |
303 | </disableD eferredWip eout> | |
304 | ||
305 | </hudson.p lugins.ws_ _cleanup.P reBuildCle anup> | |
306 | ||
307 | <org.jenki nsci.plugi ns.credent ialsbindin g.impl.Sec retBuildWr apper | |
308 | plugin="cr edentials- binding@1. 17" | |
309 | > | |
310 | ||
311 | <bindings> | |
312 | ||
313 | <org.jenki nsci.plugi ns.credent ialsbindin g.impl.Use rnamePassw ordBinding > | |
314 | ||
315 | <credentia lsId> | |
316 | jenkins_bu ild | |
317 | </credenti alsId> | |
318 | ||
319 | <variable> | |
320 | JENKINS_CR ED | |
321 | </variable > | |
322 | ||
323 | </org.jenk insci.plug ins.creden tialsbindi ng.impl.Us ernamePass wordBindin g> | |
324 | ||
325 | </bindings > | |
326 | ||
327 | </org.jenk insci.plug ins.creden tialsbindi ng.impl.Se cretBuildW rapper> | |
328 | ||
329 | </buildWra ppers> | |
330 | </project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.