Changeset 25901


Ignore:
Timestamp:
12/19/20 15:09:43 (4 years ago)
Author:
jdquinn
Message:

CHG: Need to validate unsigned repo; clean up

Location:
issm/trunk-jpl/packagers/mac
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-matlab.sh

    r25895 r25901  
    2626# - packagers/mac/complete-issm-mac-binaries-matlab.sh
    2727# - packagers/mac/sign-issm-mac-binaries-matlab.sh
     28#
     29# TODO:
     30# - Generalize checkout_*_repo_copy and validate_*_repo_copy functions (e.g.
     31#       pass 'signed' or 'unsigned' as argument)
    2832################################################################################
    2933
    … …  
    97101                rm -rf ${SIGNED_REPO_COPY}
    98102                checkout_signed_repo_copy
     103        fi
     104}
     105validate_unsigned_repo_copy(){
     106        # Validate copy of repository for unsigned binaries (e.g.
     107        # 'Check-out Strategy' was set to 'Use 'svn update' as much as possible';
     108        # initial checkout failed)
     109        if [[ ! -d ${UNSIGNED_REPO_COPY} || ! -d ${UNSIGNED_REPO_COPY}/.svn ]]; then
     110                rm -rf ${UNSIGNED_REPO_COPY}
     111                checkout_unsigned_repo_copy
    99112        fi
    100113}
    … …  
    164177
    165178# Check out copy of repository for unsigned packages
    166 checkout_unsigned_repo_copy
     179validate_unsigned_repo_copy
    167180
    168181if [ ${retrigger_signing} -eq 0 ]; then

  • issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python.sh

    r25895 r25901  
    2626# - packagers/mac/complete-issm-mac-binaries-python.sh
    2727# - packagers/mac/sign-issm-mac-binaries-python.sh
     28#
     29# TODO:
     30# - Generalize checkout_*_repo_copy and validate_*_repo_copy functions (e.g.
     31#       pass 'signed' or 'unsigned' as argument)
    2832################################################################################
    2933
    … …  
    97101                rm -rf ${SIGNED_REPO_COPY}
    98102                checkout_signed_repo_copy
     103        fi
     104}
     105validate_unsigned_repo_copy(){
     106        # Validate copy of repository for unsigned binaries (e.g.
     107        # 'Check-out Strategy' was set to 'Use 'svn update' as much as possible';
     108        # initial checkout failed)
     109        if [[ ! -d ${UNSIGNED_REPO_COPY} || ! -d ${UNSIGNED_REPO_COPY}/.svn ]]; then
     110                rm -rf ${UNSIGNED_REPO_COPY}
     111                checkout_unsigned_repo_copy
    99112        fi
    100113}
    … …  
    164177
    165178# Check out copy of repository for unsigned packages
    166 checkout_unsigned_repo_copy
     179validate_unsigned_repo_copy
    167180
    168181if [ ${retrigger_signing} -eq 0 ]; then

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh

    r25900 r25901  
    5151#
    5252export PATH="${ISSM_DIR}/bin:$(getconf PATH)" # Ensure that we pick up binaries from 'bin' directory rather than 'externalpackages'
    53 
    54 ## Functions
    55 #
    56 checkout_signed_repo_copy(){
    57         echo "Checking out copy of repository for signed packages"
    58 
    59         # NOTE: Get empty copy because we do not want to have to check out package
    60         #               from previous signing.
    61         #
    62         svn checkout \
    63                 --trust-server-cert \
    64                 --non-interactive \
    65                 --depth empty \
    66                 --username ${USERNAME} \
    67                 --password ${PASSWORD} \
    68                 ${SIGNED_REPO_URL} \
    69                 ${SIGNED_REPO_COPY} > /dev/null 2>&1
    70 }
    71 checkout_unsigned_repo_copy(){
    72         echo "Checking out copy of repository for unsigned packages"
    73         svn checkout \
    74                 --trust-server-cert \
    75                 --non-interactive \
    76                 --username ${USERNAME} \
    77                 --password ${PASSWORD} \
    78                 ${UNSIGNED_REPO_URL} \
    79                 ${UNSIGNED_REPO_COPY} > /dev/null 2>&1
    80 }
    81 validate_signed_repo_copy(){
    82         # Validate copy of repository for signed binaries (e.g.
    83         # 'Check-out Strategy' was set to 'Use 'svn update' as much as possible';
    84         # initial checkout failed)
    85         if [[ ! -d ${SIGNED_REPO_COPY} || ! -d ${SIGNED_REPO_COPY}/.svn ]]; then
    86                 rm -rf ${SIGNED_REPO_COPY}
    87                 checkout_signed_repo_copy
    88         fi
    89 }
    9053
    9154## Parse options
Note: See TracChangeset for help on using the changeset viewer.