passenger 5.2.3 → 5.3.0

data/dev/ci/lib/set-container-envvars.sh

@@ -13,6 +13,7 @@ export CCACHE_COMPRESS=1
 export CCACHE_COMPRESSLEVEL=3
 export CCACHE_BASEDIR="$PASSENGER_ROOT"
 export CCACHE_SLOPPINESS=time_macros
+export CCACHE_LOGFILE="$(pwd)/buildout/testlogs/ccache.log"
 # We want Bundler invocations to be explicit. For example,
 # when running 'rake test:install_deps', we do not want
 # to invoke Bundler there because the goal might be to
@@ -20,6 +21,11 @@ export CCACHE_SLOPPINESS=time_macros
 # which we may not have yet.
 export NOEXEC_DISABLE=1
 
+if [[ "$EXECUTOR_NUMBER" != "" ]]; then
+	(( TEST_PORT_BASE=64000+EXECUTOR_NUMBER*10 ))
+	export TEST_PORT_BASE
+fi
+
 if [[ "$OS" = macos ]]; then
 	# Ensure that Homebrew tools can be found
 	export PATH=$PATH:/usr/local/bin

data/dev/ci/lib/setup-container.sh

@@ -30,7 +30,10 @@ run chmod g+x,o+x "$HOME"
 echo
 
 header2 "Removing previous build products"
-run rm -rf buildout
+run rm -rf buildout/*
+run mkdir buildout/testlogs
+run rm -f test/test.log
+run rm -rf /tmp/psg-test-* /tmp/passenger-error-*.html
 echo
 
 # shellcheck source=../lib/set-container-envvars.sh

data/dev/ci/scripts/debug-console-wrapper.sh

@@ -12,8 +12,10 @@ if ! "$@"; then
 	echo "-----------------------------"
 	echo
 	echo "*** An error occurred ***"
+
 	if [[ "$DEBUG_CONSOLE" == 1 ]]; then
-		echo "DEBUG_CONSOLE set to 1, so launching a debugging console..."
+		echo
+		echo "*** DEBUG_CONSOLE set to 1, so launching a debugging console..."
 		echo
 		# shellcheck source=../lib/set-container-envvars.sh
 		set +e

data/dev/ci/setup-host

@@ -44,6 +44,11 @@ run mkdir -p "$CACHE_DIR/ccache"
 run mkdir -p "$CACHE_DIR/yarn"
 echo
 
+# Directory must exist so that Jenkinsfile can run archiveArtefacts().
+header2 "Creating buildout directory"
+run mkdir -p buildout buildout/testlogs
+echo
+
 if [[ "$OS" = macos ]]; then
 	export CI_COMMAND="./dev/ci/setup-host $*"
 	exec "$PASSENGER_ROOT/dev/ci/scripts/debug-console-wrapper.sh" \

data/dev/ci/tests/binaries/Jenkinsfile

@@ -0,0 +1,105 @@
+JOB_NAME_AS_ID = null
+
+def setupLinuxTest(enablerFlag, architecture, block) {
+  if (enablerFlag) {
+    node('linux') {
+      withEnv([
+        "OUTPUT_DIR=${env.WORKSPACE}/output-linux-${architecture}",
+        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME_AS_ID}/linux-${architecture}/executor-${env.EXECUTOR_NUMBER}",
+        "ARCHITECTURE=${architecture}"
+      ], block)
+    }
+  } else {
+    echo 'Test skipped.'
+  }
+}
+
+def setupMacosTest(enablerFlag, block) {
+  if (enablerFlag) {
+    node('macos') {
+      withEnv([
+        "OUTPUT_DIR=${env.WORKSPACE}/output-macos",
+        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME_AS_ID}/macos/executor-${env.EXECUTOR_NUMBER}",
+        "RUNTIME_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME_AS_ID}/macos/executor-${env.EXECUTOR_NUMBER}/runtime"
+      ], block)
+    }
+  } else {
+    echo 'Test skipped.'
+  }
+}
+
+pipeline {
+  agent { node { label 'master-pipeline' } }
+
+  options {
+    buildDiscarder(logRotator(numToKeepStr: '10'))
+    timeout(time: 45, unit: 'MINUTES')
+    disableConcurrentBuilds()
+    timestamps()
+    ansiColor('xterm')
+  }
+
+  parameters {
+    booleanParam(name: 'LINUX_X86', defaultValue: true, description: 'Linux x86 binaries')
+    booleanParam(name: 'LINUX_X86_64', defaultValue: true, description: 'Linux x86_64 binaries')
+    booleanParam(name: 'MACOS', defaultValue: true, description: 'macOS binaries')
+  }
+
+  stages {
+    stage('Initialize') {
+      steps {
+        script {
+          // The syntaxes 'env.FOO = FOO = ...' and 'FOO = env.FOO = ...'
+          // do not work for some reason; one of them will become null.
+          // So we split the assignments in two separate statements.
+
+          env.JOB_NAME_AS_ID = env.JOB_NAME.replace(' ', '-')
+          JOB_NAME_AS_ID = env.JOB_NAME_AS_ID
+
+          if (env.JOB_NAME.indexOf('Enterprise') != -1) {
+            env.ENTERPRISE = '1'
+          } else {
+            env.ENTERPRISE = '0'
+          }
+
+          // For debugging purposes
+          sh 'env | sort'
+        }
+      }
+    }
+
+    stage('Build') {
+      steps {
+        script {
+          parallel(
+            'Linux x86': {
+              setupLinuxTest(params.LINUX_X86, 'x86') {
+                checkout scm
+                sh './dev/ci/tests/binaries/build-linux'
+                archiveArtifacts artifacts: 'output-linux-x86/**/*'
+                sh './dev/ci/tests/binaries/test-linux'
+              }
+            },
+            'Linux x86_64': {
+              setupLinuxTest(params.LINUX_X86_64, 'x86_64') {
+                checkout scm
+                sh './dev/ci/tests/binaries/build-linux'
+                archiveArtifacts artifacts: 'output-linux-x86_64/**/*'
+                sh './dev/ci/tests/binaries/test-linux'
+              }
+            },
+            'macOS': {
+              setupMacosTest(params.MACOS) {
+                checkout scm
+                sh './dev/ci/tests/binaries/prepare-macos'
+                sh './dev/ci/tests/binaries/build-macos'
+                archiveArtifacts artifacts: 'output-macos/**/*'
+                sh './dev/ci/tests/binaries/test-macos'
+              }
+            }
+          )
+        }
+      }
+    }
+  }
+}

data/dev/ci/tests/binaries/build-linux

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# This script is from the "Passenger binaries test" Jenkins job. It builds
+# generic Linux binaries for a specific architecture.
+#
+# Required environment variables:
+#
+#   WORKSPACE
+#   ARCHITECTURE
+#
+# Optional environment variables:
+#
+#   PASSENGER_ROOT (defaults to $WORKSPACE)
+#   OUTPUT_DIR (defaults to $WORKSPACE/output)
+#   CACHE_DIR (defaults to $WORKSPACE/cache)
+
+set -e
+SELFDIR=$(dirname "$0")
+cd "$SELFDIR/../../../../packaging/binaries"
+# shellcheck source=../../../../packaging/binaries/shared/lib/library.sh
+source "./shared/lib/library.sh"
+
+require_envvar WORKSPACE "$WORKSPACE"
+require_envvar ARCHITECTURE "$ARCHITECTURE"
+
+PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
+OUTPUT_DIR="${OUTPUT_DIR:-$WORKSPACE/output}"
+CACHE_DIR="${CACHE_DIR:-$WORKSPACE/cache}"
+
+run mkdir -p "$OUTPUT_DIR"
+run mkdir -p "$CACHE_DIR"
+
+run ./linux/build \
+	-p "$PASSENGER_ROOT" \
+	-c "$CACHE_DIR" \
+	-o "$OUTPUT_DIR" \
+	-a "$ARCHITECTURE" \
+	-j 1 \
+	passenger nginx

data/dev/ci/tests/binaries/build-macos

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# This script is from the "Passenger binaries test" Jenkins job. It builds
+# generic macOS binaries.
+#
+# Required environment variables:
+#
+#   WORKSPACE
+#
+# Optional environment variables:
+#
+#   PASSENGER_ROOT (defaults to $WORKSPACE)
+#   OUTPUT_DIR (defaults to $WORKSPACE/output)
+#   CACHE_DIR (defaults to $WORKSPACE/cache)
+#   RUNTIME_DIR (defaults to $CACHE_DIR/runtime)
+
+set -e
+SELFDIR=$(dirname "$0")
+cd "$SELFDIR/../../../../packaging/binaries"
+# shellcheck source=../../../../packaging/binaries/shared/lib/library.sh
+source "./shared/lib/library.sh"
+
+require_envvar WORKSPACE "$WORKSPACE"
+
+PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
+OUTPUT_DIR="${OUTPUT_DIR:-$WORKSPACE/output}"
+CACHE_DIR="${CACHE_DIR:-$WORKSPACE/cache}"
+RUNTIME_DIR="${RUNTIME_DIR:-$CACHE_DIR/runtime}"
+
+RUNTIME_VERSION=$(cat shared/definitions/macos_runtime_version)
+
+run mkdir -p "$OUTPUT_DIR"
+run mkdir -p "$CACHE_DIR"
+
+run ./macos/build \
+	-p "$PASSENGER_ROOT" \
+	-r "$RUNTIME_DIR/$RUNTIME_VERSION" \
+	-c "$CACHE_DIR" \
+	-o "$OUTPUT_DIR" \
+	-j 1 \
+	passenger nginx

data/dev/ci/tests/binaries/prepare-macos

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# This script is from the "Passenger binaries test" Jenkins job. It set ups
+# a runtime directory for the "build-macos" script.
+#
+# Required environment variables:
+#
+#   WORKSPACE
+#
+# Optional environment variables:
+#
+#   PASSENGER_ROOT (defaults to $WORKSPACE)
+#   OUTPUT_DIR (defaults to $WORKSPACE/output)
+#   CACHE_DIR (defaults to $WORKSPACE/cache)
+#   RUNTIME_DIR (defaults to $CACHE_DIR/runtime)
+
+set -e
+SELFDIR=$(dirname "$0")
+cd "$SELFDIR/../../../../packaging/binaries"
+# shellcheck source=../../../../packaging/binaries/shared/lib/library.sh
+source "./shared/lib/library.sh"
+
+require_envvar WORKSPACE "$WORKSPACE"
+
+PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
+OUTPUT_DIR="${OUTPUT_DIR:-$WORKSPACE/output}"
+CACHE_DIR="${CACHE_DIR:-$WORKSPACE/cache}"
+RUNTIME_DIR="${RUNTIME_DIR:-$CACHE_DIR/runtime}"
+
+RUNTIME_VERSION=$(cat shared/definitions/macos_runtime_version)
+
+run mkdir -p "$OUTPUT_DIR"
+run mkdir -p "$CACHE_DIR"
+run mkdir -p "$RUNTIME_DIR/$RUNTIME_VERSION"
+
+run ./macos/setup-runtime \
+	-c "$CACHE_DIR" \
+	-o "$RUNTIME_DIR/$RUNTIME_VERSION" \
+	-j 1

data/dev/ci/tests/binaries/test-linux

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+# This script is from the "Passenger binaries test" Jenkins job. It runs
+# runs tests on the binaries generated by the "build-linux" script.
+#
+# Required environment variables:
+#
+#   WORKSPACE
+#   ARCHITECTURE
+#
+# Optional environment variables:
+#
+#   PASSENGER_ROOT (defaults to $WORKSPACE)
+#   OUTPUT_DIR (defaults to $WORKSPACE/output)
+#   ENTERPRISE
+
+set -e
+SELFDIR=$(dirname "$0")
+cd "$SELFDIR/../../../../packaging/binaries"
+# shellcheck source=../../../../packaging/binaries/shared/lib/library.sh
+source "./shared/lib/library.sh"
+
+require_envvar WORKSPACE "$WORKSPACE"
+require_envvar ARCHITECTURE "$ARCHITECTURE"
+
+PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
+OUTPUT_DIR="${OUTPUT_DIR:-$WORKSPACE/output}"
+
+EXTRA_TEST_PARAMS=()
+if [[ "$ENTERPRISE" = 1 ]]; then
+	EXTRA_TEST_PARAMS=(-L /etc/passenger-enterprise-license)
+fi
+
+run mkdir -p "$OUTPUT_DIR"
+run mkdir -p "$CACHE_DIR"
+
+run ./linux/package \
+	-i "$OUTPUT_DIR" \
+	-o "$OUTPUT_DIR" \
+	-a "$ARCHITECTURE"
+run ./linux/test \
+	-p "$PASSENGER_ROOT" \
+	-i "$OUTPUT_DIR" \
+	-I "$OUTPUT_DIR" \
+	-a "$ARCHITECTURE" \
+	"${EXTRA_TEST_PARAMS[@]}"

data/dev/ci/tests/binaries/test-macos

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# This script is from the "Passenger binaries test" Jenkins job. It runs
+# runs tests on the binaries generated by the "build-macos" script.
+#
+# Required environment variables:
+#
+#   WORKSPACE
+#
+# Optional environment variables:
+#
+#   PASSENGER_ROOT (defaults to $WORKSPACE)
+#   OUTPUT_DIR (defaults to $WORKSPACE/output)
+#   RUNTIME_DIR (defaults to $WORKSPACE/cache/runtime)
+
+set -e
+SELFDIR=$(dirname "$0")
+cd "$SELFDIR/../../../../packaging/binaries"
+# shellcheck source=../../../../packaging/binaries/shared/lib/library.sh
+source "./shared/lib/library.sh"
+
+require_envvar WORKSPACE "$WORKSPACE"
+
+PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
+OUTPUT_DIR="${OUTPUT_DIR:-$WORKSPACE/output}"
+RUNTIME_DIR="${RUNTIME_DIR:-$WORKSPACE/cache/runtime}"
+
+RUNTIME_VERSION=$(cat shared/definitions/macos_runtime_version)
+
+run mkdir -p "$OUTPUT_DIR"
+
+run ./macos/package \
+	-i "$OUTPUT_DIR" \
+	-o "$OUTPUT_DIR"
+run ./macos/test \
+	-p "$PASSENGER_ROOT" \
+	-r "$RUNTIME_DIR/$RUNTIME_VERSION" \
+	-i "$OUTPUT_DIR" \
+	-I "$OUTPUT_DIR"

data/dev/ci/tests/debian/Jenkinsfile

@@ -27,7 +27,7 @@ def testDebianPackages(distro, params) {
 }
 
 pipeline {
-  agent any
+  agent { node { label 'master-pipeline' } }
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '10'))
@@ -41,8 +41,8 @@ pipeline {
     booleanParam(name: 'trusty', defaultValue: true, description: 'Test Ubuntu 14.04 packages')
     booleanParam(name: 'xenial', defaultValue: true, description: 'Test Ubuntu 16.04 packages')
     booleanParam(name: 'artful', defaultValue: true, description: 'Test Ubuntu 17.10 packages')
+    booleanParam(name: 'bionic', defaultValue: true, description: 'Test Ubuntu 18.04 packages')
 
-    booleanParam(name: 'wheezy', defaultValue: true, description: 'Test Debian 7 packages')
     booleanParam(name: 'jessie', defaultValue: true, description: 'Test Debian 8 packages')
     booleanParam(name: 'stretch', defaultValue: true, description: 'Test Debian 9 packages')
   }

data/dev/ci/tests/rpm/Jenkinsfile

@@ -13,7 +13,7 @@ def setupTest(enablerFlag, distribution, architecture, block) {
 }
 
 pipeline {
-  agent any
+  agent { node { label 'master-pipeline' } }
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '10'))

data/dev/configkit-schemas/index.json

@@ -289,7 +289,7 @@
          "type" : "unsigned integer"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.2.3",
+         "default_value" : "Phusion_Passenger/5.3.0",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -324,13 +324,6 @@
          "has_default_value" : "static",
          "type" : "boolean"
       },
-      "ust_router_address" : {
-         "type" : "string"
-      },
-      "ust_router_password" : {
-         "secret" : true,
-         "type" : "string"
-      },
       "vary_turbocache_by_cookie" : {
          "type" : "string"
       }
@@ -794,7 +787,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.2.3",
+         "default_value" : "Phusion_Passenger/5.3.0",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -836,13 +829,6 @@
          "has_default_value" : "static",
          "type" : "boolean"
       },
-      "ust_router_address" : {
-         "type" : "string"
-      },
-      "ust_router_password" : {
-         "secret" : true,
-         "type" : "string"
-      },
       "vary_turbocache_by_cookie" : {
          "type" : "string"
       },
@@ -1519,7 +1505,7 @@
          "type" : "string"
       },
       "server_software" : {
-         "default_value" : "Phusion_Passenger/5.2.3",
+         "default_value" : "Phusion_Passenger/5.3.0",
          "has_default_value" : "static",
          "type" : "string"
       },
@@ -1574,13 +1560,6 @@
          "has_default_value" : "static",
          "type" : "boolean"
       },
-      "ust_router_address" : {
-         "type" : "string"
-      },
-      "ust_router_password" : {
-         "secret" : true,
-         "type" : "string"
-      },
       "vary_turbocache_by_cookie" : {
          "type" : "string"
       },