Changeset 27002

Timestamp:

05/10/22 12:14:58 (3 years ago)

Author:

jdquinn

Message:

CHG: Support for ISSM API for Python versions 2 and 3

Location:

issm/trunk-jpl/packagers

Files:

• linux/transfer-issm-linux-binaries.sh (modified) (2 diffs)
• mac/commit_for_signing-issm-mac-binaries-python-2.sh (copied) (copied from issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python.sh ) (3 diffs)
• mac/commit_for_signing-issm-mac-binaries-python-3.sh (moved) (moved from issm/trunk-jpl/packagers/mac/commit_for_signing-issm-mac-binaries-python.sh ) (3 diffs)
• mac/complete-issm-mac-binaries-python-2.sh (copied) (copied from issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh ) (6 diffs)
• mac/complete-issm-mac-binaries-python-3.sh (moved) (moved from issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh ) (6 diffs)
• mac/package-issm-mac-binaries-python-2.sh (moved) (moved from issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh ) (2 diffs)
• mac/package-issm-mac-binaries-python-3.sh (copied) (copied from issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh ) (3 diffs)
• mac/sign-issm-mac-binaries-python-2.sh (copied) (copied from issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python.sh ) (2 diffs)
• mac/sign-issm-mac-binaries-python-3.sh (moved) (moved from issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python.sh ) (2 diffs)
• mac/test-issm-mac-binaries-python-2.sh (copied) (copied from issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python.sh ) (2 diffs)
• mac/test-issm-mac-binaries-python-3.sh (moved) (moved from issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python.sh ) (2 diffs)
• mac/transfer-issm-mac-binaries.sh (modified) (2 diffs)

issm/trunk-jpl/packagers/linux/transfer-issm-linux-binaries.sh ¶

@@ -2 +2 @@
 
 ################################################################################
-# Transfers ISSM distributable package for Linux with MATLAB API to ISSM Web 
-# site.
+# Transfers ISSM distributable package for Linux to ISSM website.
 #
 # NOTE:
@@ -12 +11 @@
 # See also:
 # - packagers/linux/complete-issm-linux-binaries-matlab.sh
-# - packagers/linux/complete-issm-linux-binaries-python.sh
+# - packagers/linux/complete-issm-linux-binaries-python-2.sh
+# - packagers/linux/complete-issm-linux-binaries-python-3.sh
 ################################################################################
 

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

@@ -2 +2 @@
 
 ################################################################################
-# Commits ISSM distributable package for macOS with Python API to repository 
+# Commits ISSM distributable package for macOS with Python 2 API to repository 
 # for signing. This repository is polled by a project running on a JPL 
 # Cybersecurity Jenkins server and performs the actual signing and 
@@ -24 +24 @@
 #
 # See also:
-# - packagers/mac/complete-issm-mac-binaries-python.sh
-# - packagers/mac/sign-issm-mac-binaries-python.sh
+# - packagers/mac/complete-issm-mac-binaries-python-2.sh
+# - packagers/mac/sign-issm-mac-binaries-python-2.sh
 #
 # TODO:
@@ -65 +65 @@
 SIGNING_LOCK_FILE="signing.lock"
 UNSIGNED_REPO_COPY="./unsigned"
-UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
+UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/2/unsigned"
 
 ## Functions

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

@@ -2 +2 @@
 
 ################################################################################
-# Commits ISSM distributable package for macOS with Python API to repository 
+# Commits ISSM distributable package for macOS with Python 3 API to repository 
 # for signing. This repository is polled by a project running on a JPL 
 # Cybersecurity Jenkins server and performs the actual signing and 
@@ -24 +24 @@
 #
 # See also:
-# - packagers/mac/complete-issm-mac-binaries-python.sh
-# - packagers/mac/sign-issm-mac-binaries-python.sh
+# - packagers/mac/complete-issm-mac-binaries-python-3.sh
+# - packagers/mac/sign-issm-mac-binaries-python-3.sh
 #
 # TODO:
@@ -65 +65 @@
 SIGNING_LOCK_FILE="signing.lock"
 UNSIGNED_REPO_COPY="./unsigned"
-UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
+UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/3/unsigned"
 
 ## Functions

issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python-2.sh ¶

@@ -3 +3 @@
 ################################################################################
 # Wrapper script to build, package, send for signing, and transfer to ISSM Web 
-# site ISSM distributable package for macOS with Python API.
+# site ISSM distributable package for macOS with Python 2 API.
 #
 # Normally, we would put this directly into the project configuration under 
@@ -35 +35 @@
 #       Jenkins server. Debugging may be perfomed locally by running,
 #
-#               packagers/mac/sign-issm-mac-binaries-python.sh
+#               packagers/mac/sign-issm-mac-binaries-python-2.sh
 #
 #       with "ISSM_BINARIES_USER" and "ISSM_BINARIES_PASS" hardcoded to Apple 
@@ -56 +56 @@
 ## Constants
 #
-PKG="ISSM-macOS-Python" # Name of directory to copy distributable files to
+PKG="ISSM-macOS-Python-2" # Name of directory to copy distributable files to
 SIGNED_REPO_COPY="./signed"
-SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/signed"
+SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/2/signed"
 
 COMPRESSED_PKG="${PKG}.zip"
@@ -97 +97 @@
 # Build
 if [ ${build} -eq 1 ]; then
-        ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python
+        ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python-2
 
         if [ $? -ne 0 ]; then 
@@ -106 +106 @@
 # Package
 if [ ${package} -eq 1 ]; then
-        ./packagers/mac/package-issm-mac-binaries-python.sh $1
+        ./packagers/mac/package-issm-mac-binaries-python-2.sh $1
 
         if [ $? -ne 0 ]; then 
@@ -117 +117 @@
 # Commit for signing
 if [ ${sign} -eq 1 ]; then
-        ./packagers/mac/commit_for_signing-issm-mac-binaries-python.sh $1
+        ./packagers/mac/commit_for_signing-issm-mac-binaries-python-2.sh $1
 
         if [ $? -ne 0 ]; then 

issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python-3.sh ¶

@@ -3 +3 @@
 ################################################################################
 # Wrapper script to build, package, send for signing, and transfer to ISSM Web 
-# site ISSM distributable package for macOS with Python API.
+# site ISSM distributable package for macOS with Python 3 API.
 #
 # Normally, we would put this directly into the project configuration under 
@@ -35 +35 @@
 #       Jenkins server. Debugging may be perfomed locally by running,
 #
-#               packagers/mac/sign-issm-mac-binaries-python.sh
+#               packagers/mac/sign-issm-mac-binaries-python-3.sh
 #
 #       with "ISSM_BINARIES_USER" and "ISSM_BINARIES_PASS" hardcoded to Apple 
@@ -56 +56 @@
 ## Constants
 #
-PKG="ISSM-macOS-Python" # Name of directory to copy distributable files to
+PKG="ISSM-macOS-Python-3" # Name of directory to copy distributable files to
 SIGNED_REPO_COPY="./signed"
-SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/signed"
+SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/3/signed"
 
 COMPRESSED_PKG="${PKG}.zip"
@@ -97 +97 @@
 # Build
 if [ ${build} -eq 1 ]; then
-        ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python
+        ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python-3
 
         if [ $? -ne 0 ]; then 
@@ -106 +106 @@
 # Package
 if [ ${package} -eq 1 ]; then
-        ./packagers/mac/package-issm-mac-binaries-python.sh $1
+        ./packagers/mac/package-issm-mac-binaries-python-3.sh $1
 
         if [ $? -ne 0 ]; then 
@@ -117 +117 @@
 # Commit for signing
 if [ ${sign} -eq 1 ]; then
-        ./packagers/mac/commit_for_signing-issm-mac-binaries-python.sh $1
+        ./packagers/mac/commit_for_signing-issm-mac-binaries-python-3.sh $1
 
         if [ $? -ne 0 ]; then 

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

@@ -2 +2 @@
 
 ################################################################################
-# Packages and tests ISSM distributable package for macOS with Python API.
+# Packages and tests ISSM distributable package for macOS with Python 2 API.
 #
 # Options:
@@ -16 +16 @@
 #
 # See also:
-# - packagers/mac/complete-issm-mac-binaries-python.sh
-# - packagers/mac/sign-issm-mac-binaries-python.sh
+# - packagers/mac/complete-issm-mac-binaries-python-2.sh
+# - packagers/mac/sign-issm-mac-binaries-python-2.sh
 ################################################################################
 

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

@@ -2 +2 @@
 
 ################################################################################
-# Packages and tests ISSM distributable package for macOS with Python API.
+# Packages and tests ISSM distributable package for macOS with Python 3 API.
 #
 # Options:
@@ -16 +16 @@
 #
 # See also:
-# - packagers/mac/complete-issm-mac-binaries-python.sh
-# - packagers/mac/sign-issm-mac-binaries-python.sh
+# - packagers/mac/complete-issm-mac-binaries-python-3.sh
+# - packagers/mac/sign-issm-mac-binaries-python-3.sh
 ################################################################################
 
@@ -129 +129 @@
         export PYTHONUNBUFFERED=1 # We don't want Python to buffer output, otherwise issm.exe output is not captured
 
+        # Ensure that runme.py uses Python 3 interpreter
+        sed -i "s|/usr/bin/env python|/usr/local/bin/python3|g" ./runme.py
+
         # Run tests, redirecting output to logfile and suppressing output to console
         ./runme.py ${PYTHON_NROPTIONS} &> python.log 2>&1

issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-2.sh ¶

@@ -5 +5 @@
 # Cybersecurity server for signing macOS applications. Polls SCM of the 
 # Subversion repository hosted at 
-# https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned to trigger new 
-# builds.
+# https://issm.ess.uci.edu/svn/issm-binaries/mac/python/2/unsigned to trigger 
+# new builds.
 #
 # In order to replicate the requried Jenkins project configuration:
@@ -86 +86 @@
 NOTARIZATION_LOGFILE_PATH="."
 PASSWORD=${ISSM_BINARIES_PASS}
-PKG="ISSM-macOS-Python"
+PKG="ISSM-macOS-Python-2"
 PRIMARY_BUNDLE_ID="gov.nasa.jpl.issm.python"
 SIGNED_REPO_COPY="./signed"
-SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/signed"
+SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/2/signed"
 SIGNING_LOCK_FILE="signing.lock"
 SUCCESS_LOGFILE="${SIGNED_REPO_COPY}/success.log"
 UNSIGNED_REPO_COPY="./unsigned"
-UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
+UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/2/unsigned"
 USERNAME=${ISSM_BINARIES_USER}
 

issm/trunk-jpl/packagers/mac/sign-issm-mac-binaries-python-3.sh ¶

@@ -5 +5 @@
 # Cybersecurity server for signing macOS applications. Polls SCM of the 
 # Subversion repository hosted at 
-# https://issm.ess.uci.edu/svn/issm-binaries/mac/matlab/unsigned to trigger new 
-# builds.
+# https://issm.ess.uci.edu/svn/issm-binaries/mac/python/3/unsigned to trigger 
+# new builds.
 #
 # In order to replicate the requried Jenkins project configuration:
@@ -86 +86 @@
 NOTARIZATION_LOGFILE_PATH="."
 PASSWORD=${ISSM_BINARIES_PASS}
-PKG="ISSM-macOS-Python"
+PKG="ISSM-macOS-Python-3"
 PRIMARY_BUNDLE_ID="gov.nasa.jpl.issm.python"
 SIGNED_REPO_COPY="./signed"
-SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/signed"
+SIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/3/signed"
 SIGNING_LOCK_FILE="signing.lock"
 SUCCESS_LOGFILE="${SIGNED_REPO_COPY}/success.log"
 UNSIGNED_REPO_COPY="./unsigned"
-UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/unsigned"
+UNSIGNED_REPO_URL="https://issm.ess.uci.edu/svn/issm-binaries/mac/python/3/unsigned"
 USERNAME=${ISSM_BINARIES_USER}
 

issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh ¶

@@ -2 +2 @@
 
 ################################################################################
-# This script is intended to test ISSM macOS MATLAB binaries on an end-user 
+# This script is intended to test ISSM macOS Python 2 binaries on an end-user 
 # machine after successful packaging and signing.
 #
@@ -11 +11 @@
 #
 INSTALL_DIR=.
-PKG="ISSM-macOS-Python"
+PKG="ISSM-macOS-Python-2"
 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 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 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
 

issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh ¶

@@ -2 +2 @@
 
 ################################################################################
-# This script is intended to test ISSM macOS MATLAB binaries on an end-user 
+# This script is intended to test ISSM macOS Python 3 binaries on an end-user 
 # machine after successful packaging and signing.
 #
@@ -11 +11 @@
 #
 INSTALL_DIR=.
-PKG="ISSM-macOS-Python"
+PKG="ISSM-macOS-Python-3"
 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 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 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
 

issm/trunk-jpl/packagers/mac/transfer-issm-mac-binaries.sh ¶

@@ -2 +2 @@
 
 ################################################################################
-# Transfers ISSM distributable package for macOS with MATLAB API to ISSM Web 
-# site.
+# Transfers ISSM distributable package for macOS to ISSM website.
 #
 # NOTE:
@@ -16 +15 @@
 # See also:
 # - packagers/mac/complete-issm-mac-binaries-matlab.sh
-# - packagers/mac/complete-issm-mac-binaries-python.sh
+# - packagers/mac/complete-issm-mac-binaries-python-2.sh
+# - packagers/mac/complete-issm-mac-binaries-python-3.sh
 ################################################################################