Merge "Add schema for artifact releases"

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 0e95e0f..14fb9fc 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -30,7 +30,7 @@
     submodule-disable: false
     packer-builder: openstack
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.4.2
+    packer-version: 1.6.6
 
     #####################
     # Job Configuration #

diff --git a/releasenotes/notes/instance-metadata-skip-f80ccdd0a6c696e3.yaml b/releasenotes/notes/instance-metadata-skip-f80ccdd0a6c696e3.yaml
new file mode 100644 (file)
index 0000000..6c0b008
--- /dev/null
+++ b/releasenotes/notes/instance-metadata-skip-f80ccdd0a6c696e3.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Updates the 'capture-instance-metadata.sh' script to skip attempting
+    to capture instance metadata needed for job-cost.sh if the build is
+    being run on an unsupported cloud or platform.

diff --git a/releasenotes/notes/sudo-log-owner-03e7cf690e867482.yaml b/releasenotes/notes/sudo-log-owner-03e7cf690e867482.yaml
new file mode 100644 (file)
index 0000000..1a67dec
--- /dev/null
+++ b/releasenotes/notes/sudo-log-owner-03e7cf690e867482.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Updates the 'sudo-logs.sh' script to set ownerhsip to current build
+    user and user's login group, instead of the explicit
+    'jenkins:jenkins'. This will allow sudoer log ownership to work on
+    builders not using 'jenkins' as their build username.

diff --git a/releasenotes/notes/update-packer-version-1.6.6-1db185f45bc60ffd.yaml b/releasenotes/notes/update-packer-version-1.6.6-1db185f45bc60ffd.yaml
new file mode 100644 (file)
index 0000000..2d6ec1b
--- /dev/null
+++ b/releasenotes/notes/update-packer-version-1.6.6-1db185f45bc60ffd.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Upgrade Packer version to v1.6.6. v1.6.6 gives more debug messages which
+    is not seen with 1.4.2.

diff --git a/shell/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh
index a5914ad..c102d53 100644 (file)
--- a/shell/capture-instance-metadata.sh
+++ b/shell/capture-instance-metadata.sh
@@ -17,6 +17,11 @@ if [ -n "${NOMAD_DC}" ]; then
     exit 0
 fi
 
+if [[ ! -f /run/cloud-init/result.json ]]; then
+    echo "INFO: Running in unsupported cloud, no metadata"
+    exit 0
+fi
+
 # AWS not supported, exit
 cloudtype="$(jq -r .v1.datasource /run/cloud-init/result.json)"
 if [[ $cloudtype == "DataSourceEc2Local" ]]; then

diff --git a/shell/sudo-logs.sh b/shell/sudo-logs.sh
index 29e54df..257ee23 100755 (executable)
--- a/shell/sudo-logs.sh
+++ b/shell/sudo-logs.sh
@@ -31,7 +31,7 @@ function copy_log()
             ;;
     esac
     sudo_log=$(basename "$sudo_log")
-    sudo chown jenkins:jenkins "/tmp/$sudo_log"
+    sudo chown "$(id -nu)": "/tmp/$sudo_log"
     chmod 0644 "/tmp/$sudo_log"
     mkdir -p "$WORKSPACE/archives/sudo"
     mv "/tmp/$sudo_log" "$WORKSPACE/archives/sudo/$sudo_log"

diff --git a/shell/tox-install.sh b/shell/tox-install.sh
index 78716b0..02db0c2 100644 (file)
--- a/shell/tox-install.sh
+++ b/shell/tox-install.sh
@@ -14,23 +14,7 @@ echo "---> tox-install.sh"
 # Use -x to show value of $PYTHON in output
 set -eux -o pipefail
 
-#Python 3.5 and python2 tox in Ubuntu 16.04 workaround
-done="False"
-if [[ -f /etc/lsb-release ]]; then
-   # shellcheck disable=SC1091
-   source /etc/lsb-release
-   if [[ $DISTRIB_RELEASE == "16.04" ]]; then
-       echo "WARNING: Python projects should move to Ubuntu 18.04 to continue receiving support"
-       python2 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv more-itertools~=5.0.0
-       python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp==1.1.0
-       done="True"
-   fi
-fi
-
-if [[ $done != "True" ]]; then
-        python -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv zipp more-itertools~=5.0.0
-        python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
-fi
+python3 -m pip install --user --quiet --upgrade tox tox-pyenv virtualenv
 
 # installs are silent, show version details in log
 $PYTHON --version

diff --git a/shell/tox-run.sh b/shell/tox-run.sh
index 91e040a..68a5af9 100644 (file)
--- a/shell/tox-run.sh
+++ b/shell/tox-run.sh
@@ -13,6 +13,9 @@ echo "---> tox-run.sh"
 # do not use -o pipefail
 set -eux
 
+#Ensure that tox from tox-install.sh takes precedence.
+PATH=$HOME/.local/bin:$PATH
+
 ARCHIVE_TOX_DIR="$WORKSPACE/archives/tox"
 ARCHIVE_DOC_DIR="$WORKSPACE/archives/docs"
 mkdir -p "$ARCHIVE_TOX_DIR"
@@ -27,6 +30,9 @@ if [[ -d /opt/pyenv ]]; then
     export TOX_TESTENV_PASSENV=PYTHONPATH
 fi
 
+#Useful debug
+tox --version
+
 PARALLEL="${PARALLEL:-true}"
 if [[ ${PARALLEL,,} = true ]]; then
     if [[ -n ${TOX_ENVS:-} ]]; then