source: issm/oecreview/Archive/25834-26739/ISSM-25872-25873.diff@ 26740

Last change on this file since 26740 was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739
File size: 20.7 KB
RevLine 
[26740]1Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh
2===================================================================
3--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 25872)
4+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh (revision 25873)
5@@ -36,7 +36,7 @@
6 # help debug potential SVN issues.
7 #
8 # NOTE:
9-# - Assumes that 'issm-binaries-user' and 'issm-binaries-pass' are set up in
10+# - Assumes that "ISSM_BINARIES_USER" and "ISSM_BINARIES_PASS" are set up in
11 # the 'Bindings' section under a 'Username and password (separated)' binding
12 # (requires 'Credentials Binding Plugin').
13 # - For local debugging, the aformentioned credentials can be hardcoded into
14@@ -72,7 +72,7 @@
15 MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2006,2020,2021,2051,2052,2053,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
16 MATLAB_PATH="/Applications/MATLAB_R2018a.app"
17 NOTARIZATION_LOGFILE="notarization.log"
18-PASSWORD=$env:issm-binaries-pass
19+PASSWORD=${ISSM_BINARIES_PASS}
20 PKG="ISSM-macOS-MATLAB" # Name of directory to copy distributable files to
21 RETRIGGER_SIGNING_FILE="retrigger.txt"
22 SIGNED_REPO_COPY="./signed"
23@@ -81,7 +81,7 @@
24 SIGNING_LOCK_FILE="signing.lock"
25 UNSIGNED_REPO_COPY="./unsigned"
26 UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned"
27-USERNAME=$env:issm-binaries-user
28+USERNAME=${ISSM_BINARIES_USER}
29
30 COMPRESSED_PKG="${PKG}.zip"
31
32@@ -88,7 +88,7 @@
33 ## Environment
34 #
35 export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
36-
37+AGU
38 ## Parse options
39 #
40 if [ $# -gt 1 ]; then
41@@ -115,7 +115,9 @@
42 # Remove signing lock file from signed package repository so that a new
43 # build can run
44 echo "Removing lock file from repository for signed packages"
45- svn co \
46+ svn checkout \
47+ --trust-server-cert \
48+ --non-interactive \
49 --username ${USERNAME} \
50 --password ${PASSWORD} \
51 --depth empty \
52@@ -123,7 +125,12 @@
53 ${SIGNED_REPO_COPY} > /dev/null 2>&1
54 svn up ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE} > /dev/null 2>&1
55 svn delete ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE} > /dev/null 2>&1
56- svn commit --message "DEL: Removing lock file after failed build" ${SIGNED_REPO_COPY} > /dev/null 2>&1
57+ svn commit \
58+ --trust-server-cert \
59+ --non-interactive \
60+ --username ${USERNAME} \
61+ --password ${PASSWORD} \
62+ --message "DEL: Removing lock file after failed build" ${SIGNED_REPO_COPY} > /dev/null 2>&1
63 svn cleanup ${SIGNED_REPO_COPY} > /dev/null 2>&1
64 exit 1
65 fi
66@@ -148,7 +155,9 @@
67 # previous signing.
68 #
69 echo "Checking out copy of repository for signed packages"
70- svn co \
71+ svn checkout \
72+ --trust-server-cert \
73+ --non-interactive \
74 --username ${USERNAME} \
75 --password ${PASSWORD} \
76 --depth empty \
77@@ -265,7 +274,12 @@
78 echo "Committing lock file to repository for signed packages"
79 touch ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE}
80 svn add ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE} > /dev/null 2>&1
81- svn commit --message "ADD: New lock file" ${SIGNED_REPO_COPY} > /dev/null 2>&1
82+ svn commit \
83+ --trust-server-cert \
84+ --non-interactive \
85+ --username ${USERNAME} \
86+ --password ${PASSWORD} \
87+ --message "ADD: New lock file" ${SIGNED_REPO_COPY} > /dev/null 2>&1
88
89 # Save current working copy revision number
90 svn up ${SIGNED_REPO_COPY} > /dev/null 2>&1
91@@ -273,7 +287,9 @@
92
93 # Check out copy of SVN repository for unsigned packages
94 echo "Checking out copy of repository for unsigned packages"
95- svn co \
96+ svn checkout \
97+ --trust-server-cert \
98+ --non-interactive \
99 --username ${USERNAME} \
100 --password ${PASSWORD} \
101 ${UNSIGNED_REPO_URL} \
102@@ -288,7 +304,12 @@
103 echo "Committing package to repository for unsigned packages"
104 cp ${COMPRESSED_PKG} ${UNSIGNED_REPO_COPY}
105 svn add ${UNSIGNED_REPO_COPY}/${COMPRESSED_PKG} > /dev/null 2>&1
106- svn commit --message "CHG: New unsigned package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
107+ svn commit \
108+ --trust-server-cert \
109+ --non-interactive \
110+ --username ${USERNAME} \
111+ --password ${PASSWORD} \
112+ --message "CHG: New unsigned package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
113 else
114 # NOTE: If notarize_only == 1, we commit a dummy file as the signing
115 # build on the remote JPL Cybersecurity Jenkins server is
116@@ -297,7 +318,12 @@
117 echo "Attempting to sign existing package again"
118 touch ${UNSIGNED_REPO_COPY}/${RETRIGGER_SIGNING_FILE}
119 svn add ${UNSIGNED_REPO_COPY}/${RETRIGGER_SIGNING_FILE} > /dev/null 2>&1
120- svn commit --message "ADD: Retriggering signing with same package (previous attempt failed)" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
121+ svn commit \
122+ --trust-server-cert \
123+ --non-interactive \
124+ --username ${USERNAME} \
125+ --password ${PASSWORD} \
126+ --message "ADD: Retriggering signing with same package (previous attempt failed)" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
127 fi
128
129 # Check status of signing
130Index: ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh
131===================================================================
132--- ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh (revision 25872)
133+++ ../trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh (revision 25873)
134@@ -36,7 +36,7 @@
135 # help debug potential SVN issues.
136 #
137 # NOTE:
138-# - Assumes that 'issm-binaries-user' and 'issm-binaries-pass' are set up in
139+# - Assumes that "ISSM_BINARIES_USER" and "ISSM_BINARIES_PASS" are set up in
140 # the 'Bindings' section under a 'Username and password (separated)' binding
141 # (requires 'Credentials Binding Plugin').
142 # - For local debugging, the aformentioned credentials can be hardcoded into
143@@ -70,7 +70,7 @@
144 ## Constants
145 #
146 NOTARIZATION_LOGFILE="notarization.log"
147-PASSWORD=$env:issm-binaries-pass
148+PASSWORD=${ISSM_BINARIES_PASS}
149 PKG="ISSM-macOS-Python" # Name of directory to copy distributable files to
150 PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2006 2020 2021 2051 2052 2053 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded
151 RETRIGGER_SIGNING_FILE="retrigger.txt"
152@@ -80,7 +80,7 @@
153 SIGNING_LOCK_FILE="signing.lock"
154 UNSIGNED_REPO_COPY="./unsigned"
155 UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
156-USERNAME=$env:issm-binaries-user
157+USERNAME=${ISSM_BINARIES_USER}
158
159 COMPRESSED_PKG="${PKG}.zip"
160
161@@ -114,7 +114,9 @@
162 # Remove signing lock file from signed package repository so that a new
163 # build can run
164 echo "Removing lock file from repository for signed packages"
165- svn co \
166+ svn checkout \
167+ --trust-server-cert \
168+ --non-interactive \
169 --username ${USERNAME} \
170 --password ${PASSWORD} \
171 --depth empty \
172@@ -122,7 +124,12 @@
173 ${SIGNED_REPO_COPY} > /dev/null 2>&1
174 svn up ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE} > /dev/null 2>&1
175 svn delete ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE} > /dev/null 2>&1
176- svn commit --message "DEL: Removing lock file after failed build" ${SIGNED_REPO_COPY} > /dev/null 2>&1
177+ svn commit \
178+ --trust-server-cert \
179+ --non-interactive \
180+ --username ${USERNAME} \
181+ --password ${PASSWORD} \
182+ --message "DEL: Removing lock file after failed build" ${SIGNED_REPO_COPY} > /dev/null 2>&1
183 svn cleanup ${SIGNED_REPO_COPY} > /dev/null 2>&1
184 exit 1
185 fi
186@@ -141,7 +148,9 @@
187 # from previous signing.
188 #
189 echo "Checking out copy of repository for signed packages"
190- svn co \
191+ svn checkout \
192+ --trust-server-cert \
193+ --non-interactive \
194 --username ${USERNAME} \
195 --password ${PASSWORD} \
196 --depth empty \
197@@ -266,7 +275,12 @@
198 echo "Committing lock file to repository for signed packages"
199 touch ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE}
200 svn add ${SIGNED_REPO_COPY}/${SIGNING_LOCK_FILE} > /dev/null 2>&1
201- svn commit --message "ADD: New lock file" ${SIGNED_REPO_COPY} > /dev/null 2>&1
202+ svn commit \
203+ --trust-server-cert \
204+ --non-interactive \
205+ --username ${USERNAME} \
206+ --password ${PASSWORD} \
207+ --message "ADD: New lock file" ${SIGNED_REPO_COPY} > /dev/null 2>&1
208
209 # Save current working copy revision number
210 svn up ${SIGNED_REPO_COPY} > /dev/null 2>&1
211@@ -274,7 +288,9 @@
212
213 # Check out copy of SVN repository for unsigned packages
214 echo "Checking out copy of repository for unsigned packages"
215- svn co \
216+ svn checkout \
217+ --trust-server-cert \
218+ --non-interactive \
219 --username ${USERNAME} \
220 --password ${PASSWORD} \
221 ${UNSIGNED_REPO_URL} \
222@@ -289,7 +305,12 @@
223 echo "Committing package to repository for unsigned packages"
224 cp ${COMPRESSED_PKG} ${UNSIGNED_REPO_COPY}
225 svn add ${UNSIGNED_REPO_COPY}/${COMPRESSED_PKG} > /dev/null 2>&1
226- svn commit --message "CHG: New unsigned package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
227+ svn commit \
228+ --trust-server-cert \
229+ --non-interactive \
230+ --username ${USERNAME} \
231+ --password ${PASSWORD} \
232+ --message "CHG: New unsigned package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
233 else
234 # NOTE: If notarize_only == 1, we commit a dummy file as the signing
235 # build on the remote JPL Cybersecurity Jenkins server is
236@@ -298,7 +319,12 @@
237 echo "Attempting to sign existing package again"
238 touch ${UNSIGNED_REPO_COPY}/${RETRIGGER_SIGNING_FILE}
239 svn add ${UNSIGNED_REPO_COPY}/${RETRIGGER_SIGNING_FILE} > /dev/null 2>&1
240- svn commit --message "ADD: Retriggering signing with same package (previous attempt failed)" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
241+ svn commit \
242+ --trust-server-cert \
243+ --non-interactive \
244+ --username ${USERNAME} \
245+ --password ${PASSWORD} \
246+ --message "ADD: Retriggering signing with same package (previous attempt failed)" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
247 fi
248
249 # Check status of signing
250Index: ../trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh
251===================================================================
252--- ../trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh (revision 25872)
253+++ ../trunk-jpl/packagers/mac/sign-issm-mac-binaries-matlab.sh (revision 25873)
254@@ -16,18 +16,20 @@
255 # - Navigate to 'Manage Jenkins' -> 'Manage Credentials' -> <domain> ->
256 # 'Add Credentials' and enter the crendentials from above.
257 # - From the 'Dashboard', select 'New Item' -> 'Freestyle project'.
258-# - Under 'Source Code Management', select 'Subversion'.
259+# - Under 'Source Code Management', select 'Subversion'.
260 # - The 'Repository URL' text field should be set to
261-# "https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned"
262+# "https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned".
263 # - The 'Credentials' select menu should be set to the new credentials
264 # created previously.
265+# - The 'Local module directory' text field should be set to the same
266+# value as the constant UNSIGNED_REPO_COPY (set below to './unsigned').
267 # - Under 'Build Trigggers', check the box for 'Poll SCM' and set the
268 # 'Schedule' text area to "H/5 * * * *".
269 # - Under 'Build Environment', check the box for 'Use secret text(s) or
270 # file(s)', then under 'Bindings' click the 'Add...' button and select
271 # 'Username and password (separated)'.
272-# - Set 'Username Variable' to "issm-binaries-user”.
273-# - Set 'Password Variable' to "issm-binaries-pass”.
274+# - Set 'Username Variable' to "ISSM_BINARIES_USER".
275+# - Set 'Password Variable' to "ISSM_BINARIES_PASS".
276 # - Under 'Credentials', select the same, new credentials that created
277 # previously.
278 # - The contents of this script can be copied/pasted directly into the ‘Build'
279@@ -81,6 +83,7 @@
280 NOTARIZATION_CHECK_PERIOD=60
281 NOTARIZATION_LOGFILE="notarization.log"
282 NOTARIZATION_LOGFILE_PATH="."
283+PASSWORD=${ISSM_BINARIES_PASS}
284 PKG="ISSM-macOS-MATLAB"
285 PRIMARY_BUNDLE_ID="**********.issm.matlab" # Should be "gov.nasa.jpl.issm.matlab"
286 RETRIGGER_SIGNING_FILE="retrigger.txt"
287@@ -90,6 +93,7 @@
288 SUCCESS_LOGFILE="${SIGNED_REPO_COPY}/success.log"
289 UNSIGNED_REPO_COPY="./unsigned"
290 UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned"
291+USERNAME=${ISSM_BINARIES_USER}
292
293 COMPRESSED_PKG="${PKG}.zip"
294 EXE_ENTITLEMENTS_PLIST="${PKG}/bin/entitlements.plist"
295@@ -100,13 +104,18 @@
296 rm -rf ${PKG} ${COMPRESSED_PKG} ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} ${SIGNED_REPO_COPY} ${UNSIGNED_REPO_COPY}
297 mkdir ${PKG}
298
299+# NOTE: Uncomment the following for local testing (Jenkins checks out copy of
300+# repository for unsigned packages to working directory)
301+#
302 # Check out copy of repository for unsigned packages
303-echo "Checking out copy of respository for unsigned packages"
304-svn co \
305- --username ${USERNAME} \
306- --password ${PASSWORD} \
307- ${UNSIGNED_REPO_URL} \
308- ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
309+# echo "Checking out copy of respository for unsigned packages"
310+# svn checkout \
311+# --trust-server-cert \
312+# --non-interactive \
313+# --username ${USERNAME} \
314+# --password ${PASSWORD} \
315+# ${UNSIGNED_REPO_URL} \
316+# ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
317
318 # Extract package contents
319 echo "Extracting package contents"
320@@ -238,11 +247,18 @@
321
322 # Remove dummy file for retriggering signing/notarization (if it exists)
323 svn delete ${UNSIGNED_REPO_COPY}/${RETRIGGER_SIGNING_FILE} > /dev/null 2>&1
324-svn commit --message "DEL: Removing dummy file for retriggering signing of same package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
325+svn commit \
326+ --trust-server-cert \
327+ --non-interactive \
328+ --username ${USERNAME} \
329+ --password ${PASSWORD} \
330+ --message "DEL: Removing dummy file for retriggering signing of same package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
331
332 # Check out copy of repository for signed packages
333 echo "Checking out copy of respository for signed packages"
334-svn co \
335+svn checkout \
336+ --trust-server-cert \
337+ --non-interactive \
338 --username ${USERNAME} \
339 --password ${PASSWORD} \
340 ${SIGNED_REPO_URL} \
341@@ -262,11 +278,21 @@
342
343 # Commit changes
344 echo "Committing changes to repository for signed packages"
345- svn commit --message "CHG: New signed package (success)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
346+ svn commit \
347+ --trust-server-cert \
348+ --non-interactive \
349+ --username ${USERNAME} \
350+ --password ${PASSWORD} \
351+ --message "CHG: New signed package (success)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
352 else
353 # Commit changes
354 echo "Committing changes to repository for signed packages"
355- svn commit --message "CHG: New signed package (failure)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
356+ svn commit \
357+ --trust-server-cert \
358+ --non-interactive \
359+ --username ${USERNAME} \
360+ --password ${PASSWORD} \
361+ --message "CHG: New signed package (failure)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
362
363 exit 1
364 fi
365Index: ../trunk-jpl/packagers/mac/sign-issm-mac-binaries-python.sh
366===================================================================
367--- ../trunk-jpl/packagers/mac/sign-issm-mac-binaries-python.sh (revision 25872)
368+++ ../trunk-jpl/packagers/mac/sign-issm-mac-binaries-python.sh (revision 25873)
369@@ -4,7 +4,7 @@
370 # Intended to be run in the context of a Jenkins project on a JPL
371 # Cybersecurity server for signing macOS applications. Polls SCM of the
372 # Subversion repository hosted at
373-# https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned to trigger new
374+# https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned to trigger new
375 # builds.
376 #
377 # In order to replicate the requried Jenkins project configuration:
378@@ -16,18 +16,20 @@
379 # - Navigate to 'Manage Jenkins' -> 'Manage Credentials' -> <domain> ->
380 # 'Add Credentials' and enter the crendentials from above.
381 # - From the 'Dashboard', select 'New Item' -> 'Freestyle project'.
382-# - Under 'Source Code Management', select 'Subversion'.
383+# - Under 'Source Code Management', select 'Subversion'.
384 # - The 'Repository URL' text field should be set to
385-# "https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
386+# "https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned".
387 # - The 'Credentials' select menu should be set to the new credentials
388 # created previously.
389+# - The 'Local module directory' text field should be set to the same
390+# value as the constant UNSIGNED_REPO_COPY (set below to './unsigned').
391 # - Under 'Build Trigggers', check the box for 'Poll SCM' and set the
392 # 'Schedule' text area to "H/5 * * * *".
393 # - Under 'Build Environment', check the box for 'Use secret text(s) or
394 # file(s)', then under 'Bindings' click the 'Add...' button and select
395 # 'Username and password (separated)'.
396-# - Set 'Username Variable' to "issm-binaries-user”.
397-# - Set 'Password Variable' to "issm-binaries-pass”.
398+# - Set 'Username Variable' to "ISSM_BINARIES_USER".
399+# - Set 'Password Variable' to "ISSM_BINARIES_PASS".
400 # - Under 'Credentials', select the same, new credentials that created
401 # previously.
402 # - The contents of this script can be copied/pasted directly into the ‘Build'
403@@ -46,6 +48,9 @@
404 # the 'USERNAME' and 'PASSWORD' constants below.
405 ################################################################################
406
407+# Expand aliases within the context of this script
408+shopt -s expand_aliases
409+
410 # From https://developer.apple.com/documentation/macos-release-notes/macos-catalina-10_15-release-notes,
411 #
412 # Command line tool support for Subversion — including svn, git-svn, and
413@@ -59,7 +64,8 @@
414 # when calling svn, even when subversion is installed via Homebrew and its path
415 # is available in PATH.
416 #
417-shopt -s expand_aliases
418+# NOTE: May be able to remove this after updating macOS.
419+#
420 alias svn='/usr/local/bin/svn'
421
422 ## Override certain other aliases
423@@ -77,6 +83,7 @@
424 NOTARIZATION_CHECK_PERIOD=60
425 NOTARIZATION_LOGFILE="notarization.log"
426 NOTARIZATION_LOGFILE_PATH="."
427+PASSWORD=${ISSM_BINARIES_PASS}
428 PKG="ISSM-macOS-Python"
429 PRIMARY_BUNDLE_ID="**********.issm.python" # Should be "gov.nasa.jpl.issm.python"
430 RETRIGGER_SIGNING_FILE="retrigger.txt"
431@@ -86,6 +93,7 @@
432 SUCCESS_LOGFILE="${SIGNED_REPO_COPY}/success.log"
433 UNSIGNED_REPO_COPY="./unsigned"
434 UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
435+USERNAME=${ISSM_BINARIES_USER}
436
437 COMPRESSED_PKG="${PKG}.zip"
438 EXE_ENTITLEMENTS_PLIST="${PKG}/bin/entitlements.plist"
439@@ -96,13 +104,18 @@
440 rm -rf ${PKG} ${COMPRESSED_PKG} ${NOTARIZATION_LOGFILE_PATH}/${NOTARIZATION_LOGFILE} ${SIGNED_REPO_COPY} ${UNSIGNED_REPO_COPY}
441 mkdir ${PKG}
442
443+# NOTE: Uncomment the following for local testing (Jenkins checks out copy of
444+# repository for unsigned packages to working directory)
445+#
446 # Check out copy of repository for unsigned packages
447-echo "Checking out copy of respository for unsigned packages"
448-svn co \
449- --username ${USERNAME} \
450- --password ${PASSWORD} \
451- ${UNSIGNED_REPO_URL} \
452- ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
453+# echo "Checking out copy of respository for unsigned packages"
454+# svn checkout \
455+# --trust-server-cert \
456+# --non-interactive \
457+# --username ${USERNAME} \
458+# --password ${PASSWORD} \
459+# ${UNSIGNED_REPO_URL} \
460+# ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
461
462 # Extract package contents
463 echo "Extracting package contents"
464@@ -243,11 +256,18 @@
465
466 # Remove dummy file for retriggering signing/notarization (if it exists)
467 svn delete ${UNSIGNED_REPO_COPY}/${RETRIGGER_SIGNING_FILE} > /dev/null 2>&1
468-svn commit --message "DEL: Removing dummy file for retriggering signing of same package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
469+svn commit \
470+ --trust-server-cert \
471+ --non-interactive \
472+ --username ${USERNAME} \
473+ --password ${PASSWORD} \
474+ --message "DEL: Removing dummy file for retriggering signing of same package" ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
475
476 # Check out copy of repository for signed packages
477 echo "Checking out copy of respository for signed packages"
478-svn co \
479+svn checkout \
480+ --trust-server-cert \
481+ --non-interactive \
482 --username ${USERNAME} \
483 --password ${PASSWORD} \
484 ${SIGNED_REPO_URL} \
485@@ -267,11 +287,21 @@
486
487 # Commit changes
488 echo "Committing changes to repository for signed packages"
489- svn commit --message "CHG: New signed package (success)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
490+ svn commit \
491+ --trust-server-cert \
492+ --non-interactive \
493+ --username ${USERNAME} \
494+ --password ${PASSWORD} \
495+ --message "CHG: New signed package (success)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
496 else
497 # Commit changes
498 echo "Committing changes to repository for signed packages"
499- svn commit --message "CHG: New signed package (failure)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
500+ svn commit \
501+ --trust-server-cert \
502+ --non-interactive \
503+ --username ${USERNAME} \
504+ --password ${PASSWORD} \
505+ --message "CHG: New signed package (failure)" ${SIGNED_REPO_COPY} > /dev/null 2>&1
506
507 exit 1
508 fi
Note: See TracBrowser for help on using the repository browser.