Attempt to get CI working again

Author: ndw

.travis.yml

@@ -7,18 +7,8 @@ before_install:
 - echo 'America/Los_Angeles' | sudo tee /etc/timezone
 - sudo dpkg-reconfigure --frontend noninteractive tzdata
 install:
-- if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then ./shared/dev-tasks/travis-install-ml.sh
-  release ; else (exit 0) ; fi
-- if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then ./shared/dev-tasks/setup-marklogic.sh
-  ; else (exit 0) ; fi
+- if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then ./shared/dev-tasks/travis-install-ml.sh release ; else (exit 0) ; fi
+- if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then ./shared/dev-tasks/setup-marklogic.sh ; else (exit 0) ; fi
 script:
 - python setup.py test
-env:
-  global:
-  - secure: PnQR4S2RarIhtnZaN1jOd3RyCH3L1PhQ+AAxhmmlO9xqJ8NJ4PCzOIC86e/BK5RiobFscxU0vQIb7wNIIbw0sKKykYg3lWRlusrW7IJ2fEuLj/sm/ixgnh2S8KTz+DzjbLPbN8N5W1spu4cdYNIBFb5hOMHFU+xZ3Vi/SKlQDyvqjUicY/JIKKjYn572Hg5UgEIwUt2QCzWZ/2brRR8jqLC5EiUnT6UbfNIfXIBKQM8z80C/neWGSMDZVFHEnRJHxI+RvPdAqEkSFtvT/zAb/C1n5r//AShBECt9LA09CRC5MZicgAJOKJ1EvlCus92xxeu7JjC96fZ2yBI2ZmkaZoN4o5IBUkNOG8HB5gX6vpAR2PI/GqWj3ubSmrcoWBm7dudju/PRvCAt0wUwt+xAxfIlHuFQCfjaEwr5mOMVLlDxCIrEgVhZxdTqHGPOHAleZqIvycjT5QOflNdFpmWRx04Y121w+gaSfAW6rUHkTt1+UeF+GFFK5gh78hjFy43/V/7M+U6M/DHQExy63bs0r07biIMfEYbKLocEoJcPj1RwZpvQCo28jrLTdwCnbLsdCDsWbK0wojvmKhxXl5j8J8uRSyd5egwu9h3qYZdmJTzk8904cfPYDhPWDc+rauro0gRbFCx0JRtkHiDUYEfHbUWNvW/bXupUp2LHZ2+3OYU=
-  - secure: QYaSKzNeEexu8YiLA1il9Nn5+DCvFRosIoLiZRtOobMgywHD5sL0xuj04dxP20yvapkdXOLB8MMF5Z+EZLqM4QvMx3bO+EoXNcVd/SQDa1eXIEihdAy9+o8jgIHgF6DTzApvBIbDDy6d4WJDud3lQ/7Mq6ysK4K0YXUS5458TuCNxx7v7gmJp1cZfvaBxMxEua5U/IgzY4/K4Uo14adC15aJ1tUM4bxj3ByYk+LUFVkkk/kNrgTFZoipxAyq1qKTjntQ3GP7K/9cQ6EqVWgkV4DA54CgZLypHdwwIm6ODE3uktTYmuZ425Uvk8vjsKkpQTNGvBu++NK4Y1JehFDqn9HFWrZ9jAIciDaIL0dHvas634jeL65xanB6IzliUFmnWIP3eIS84UedIiAkz6TIpO6f7HOf4ja1IG19d4WtwmD2p+RFPzAlIOstKg3bMauyG8e952tPH5IAqIGA68avtlDeNOMnCP9jN6/DyozcTYaMguq6prhHUIb7Xzo5w6oGS/rq8ctkcL/BkAcGd8KgYYIqXJCckwZdE0HOeUJRUjUguXLvpStFXRycoa2bwg61tJUsLwitO87Gs2iY9Op96tkpfFESZpfqFN+Yc+hxhikRi8mXwnzn5RLp6xCVuYVAF+ioEYP+Ygsd6/3rLStgWFsmfCJ46WkgYRtnOQ+0+Zs=
-  - secure: sRIY5ub8TaAeMRwLgMOHPIRE+wIk9dbxC4yZ7uGU8kwkS/+I/opMiY3gK8vcMGpdGzvUnOxHadgSmX/dnZQE595g35IKtIqVpyGoC2bqawHToFCozrSmKM0LjsMuAR7ZcmbHMknD4dvrtP9pTMlNz1YntwXJAp90SgTjSIYAmwo2zbTvCBsQQP7HP867v6A6IYm3Y0ZRV/wkzkljecXTc0x9EXRvh4s8Gz9aawhsFW3/Lmvs7GqYdEBbBdSAKUWsmjIE0a+w969bpDyY18EJZdKuCyOMnZnHxhD5ug0xGPacx/pg/8dfhnRAaxJa60Tv7q8ebplg5eeGNiZp5HLNahYzVhjokNNokzSWMSQTYTFHnTcjPv1eKAfVihGpfFG5B0nlUscS/h3t+O9eEMRUbggvAORR94kAKrc7zTnrgbZ5UE6kk3urVJVE9KqkCUOexBlF0xshVfkdqSsHpfHfKqGGYv2KZ16LJ/Zagpag+A9dzBHmeFswtTdFR8pkibpYBy4mQ0+MswZEP7bqoGJwyLKAyQJdMiYU3YvAGdIRqfezIqsI/vwG2DmknuWPJqG3EnhA/KwxH2B9EYoYNexWg/CmL4viX1e978Y/+fhOUyZ02KNL7/D62eEAotMGX6zfJQFbAHAgmnjrl5g0dS3BPGS1oVbeNfb6HJSz0FuYvxI=
-  - secure: hNF1QKlYgPuRabQ9gQIn7URHgM1K0CT9uPncjcGgDD19J5Sw5GlCJnCPiJz3q/oBCtD+aF0LlNpQbtEPVwd6zqRrxiyN+9lKe6tVkCf7W+EAWV6tEmNK0F/MWy0/hrjKzx5YKLZGJ0ts0RqsPxr6mWsUIn8RLqTEgoRxylSBxIYJtsfpr7jmub8AY2Xa8+pIZB07jssAMWhFLI8PzBw5Bk8qKgcbNLE5HfTF63szZxw65soQc1ALlfkubSqDO78LQygxsF41M2MLmFzPKejmRP6tsZFuWNxNdR04U2d8qb7k4GlE+SuVFi0HhZsWivsarrGh7uZTav7m1VBqrtSG5RXB/i3A8T88wWCXezW7x6V00oxWCjMznbxyyu+8WKC09+DlOdvmxKu1aeFo5eBZZnTstv5dslDrJi8MEOJfK9gVtrRgHhFS9HARAPL8SqrDtl6siga7WRqP7i+qIHYI6zgtwwFNU2WAGR/wizz9TkX9ir+djwn0++jfOmeQzEQstBE+mC0ER1/ALDStTfnFfrml7gU1pBQticfTSHpnZXfP5D3HkCBaW4X6ONpgjXbFARnTn2nk4lOR261Biu/hFPBjld2HK6Elj0IJbyCRZ5o4ZxZ1QUhsuz5Y4r41Y5TA9GbZ/cHzb66fFkWv1KpRJJ+iNASQq10y4fnwuUZMGZU=
-  - secure: qDaDm7x/OXf3fJrikh2y2mcnB7jGbJj2kbU52kUJPwd5hC6CXB/fVguNybx4rZDdcYjbUDNpU3CfeT4De0/aHpDRvNL9mK0JDQkgAz3BkhEv5QchxNw17Tt4KYany8SUh6mWsMAfMBHdUxumF1PhbTJG+3tw2PcH96nxCgoR2ZA1lN4gutfIKYl/NGKZUhrD1kqGNiFCuZD9jBu1VwT4Sqy0v7PWYtpsuwP0rhDRAdQfEuLFnuzQIXnpkK1Jha4d5XMwwNT8rYme+tfisQDx7SQBw8nIkFp3AMZNEsW0WFReodx2Jwg7XbKLp2JtsUH+jTpXJcXTLsUmmr1hISL7WCWwrgM01Om8EEE7ZlJMzwTbbj4z59GPBo/9pMIxvxitiiurcgMK4PTbQFhZhbANcTxUAHwbZ2/D905mRK1n0ze8+272KqWg+P9vzTE3YKmLnA2g+6ho1PSScMidDqlveKCOMH2X+8VylKdK/cVbCIsOwLlN9VO87cKCSOp047+tDRwbIlbalv2RvpmTvZRu51PItcCRfMgHafKu2/8hkSVKsUmITiXfqWggpc6rbmlB5tFof5xWWsdk5s+0hkm3NJYFLcz7nn+LF39qGmGxxXUu/95317NVunAYpy7ad2BAiLF4B9HWqZcHXwOvQVIdIMUUCx7iooE7/zvmWUQi4jc=
-  - secure: XmzdhkjTrHPkNX3CZIkrWttsnWrS3+6I79Dkdv+P/maAW4hAQ2ipdHEPtyTMGU4Q2f+TlbFgjFtgUbwxHHEjFKk2NmuUFn01dsSFCOpq71DjLDeH+isHnmwDufpmuD6nACB/EJDkx8GHP1qFMeIkCuabgAxcFO2MtkWiYTZyMZeCfIkQ8jkrFN+kDgnsdsuSxMkkoEHq+Fi+SyWWxgACdraklcAldUeA9GzpFu9mti8Ud4K6YWZtv8iS4EZPuoLnpv+DQaOXbCqjXheOOTAy0UJEC1C+9QnLoJYh+qIcbvMjmyNv6XpGSkteB1gOVCJUQKz6gkF+78iQF18e2qEJGcnjw28PtvX9TKdY3GbxCRPxSLGyAZ5TE30v+WuwW/UPnKhPgt6ay8K949kz4VilW69919iE41/Cyny/ssLe6XFUvme+oWCC9KPhfmnXG42a8USKbZ8HjP5bjlvova92eMCfJpWlF0Q6SXqaf6mYJ4Uk0n6VLsrDTMabTVApady/XcRzHkN345rthGb9Xwp35Zvc1hoS7HsosqYJajRFfLeJohy0LX3RYr3Yb0f1fI22pV4AkcidXQqbPeTFPVzC+q9Iyh3nn1pBKn5SrPu+emwk3IXX8vxzixmyqlIrHLmVLAI63jKMrDG3LcQdk7H6Uy/KEm5qpLRhYJm18dxHRuo=
 

shared/dev-tasks/travis-install-ml.sh

@@ -11,18 +11,11 @@ function successOrExit {
     fi
 }
 
-set | grep TRAVIS
-
 test $1 && arg1=$1
 if [[ $arg1 = 'release' ]]; then
-  fname=MarkLogic-8.0-20150819.x86_64.rpm
-  ver=8.0-4
-  fnamedeb="marklogic_"
-  fnamedeb=$fnamedeb$ver
-  suff="_amd64.deb"
-  fnamedeb=$fnamedeb$suff
-
-  url=$MLRELEASE_URL
+  fname=marklogic.rpm
+  ver="9.0-8.2"
+  url="$MLRELEASE/MarkLogic-$ver.x86_64.rpm"
 
   echo "********* Downloading MarkLogic $ver"
 
@@ -39,43 +32,12 @@ if [[ $arg1 = 'release' ]]; then
 
     echo "********* MarkLogic $ver installed"
   else
-    echo "CANNOT DOWNLOAD: status = $status for version $ver (URL=secure/suppressed)"
+    echo "CANNOT DOWNLOAD: status = $status"
     exit 1
   fi
 else
-  # find today
-  day=$(date +"%Y%m%d")
-
-  # if the user passed a day string as a param then use it instead
-  test $1 && day=$1
-  # make a version number out of the date
-  ver="8.0-$day"
-
-  echo "********* Downloading MarkLogic nightly $ver"
-
-  # fetch/install ML nightly
-  fname="MarkLogic-$ver.x86_64.rpm"
-  fnamedeb="marklogic_"
-  fnamedeb=$fnamedeb$ver
-  suff="_amd64.deb"
-  fnamedeb=$fnamedeb$suff
-
-  url="https://root.marklogic.com/nightly/builds/linux64/rh6-intel64-80-test-1.marklogic.com/b8_0/pkgs.$day/$fname"
-
-  status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
-  if [[ $status = 200 ]]; then
-    successOrExit curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD -o ./$fname $url
+  # FIXME: TBD.
 
-    fname=$(pwd)/$fname
-
-    sudo apt-get update
-    sudo apt-get install alien dpkg-dev debhelper build-essential
-    sudo alien -d -k $fname
-    sudo dpkg -i $fnamedeb
-
-    echo "********* MarkLogic nightly $ver installed"
-  else
-    echo "CANNOT DOWNLOAD: status = $status for date $day (URL=\"$url\")"
-    exit 1
-  fi
+  echo "Cannot download nightlies."
+  exit 1
 fi