Merge "Add pipeline-verify jobs to lint and check agents"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bdc64bc..3b8d1f1 100644 (file)
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: shellcheck
 
   - repo: https://github.com/btford/write-good
-    rev: master
+    rev: v1.0.4
     hooks:
       - id: write-good
         exclude: >
@@ -33,7 +33,7 @@ repos:
           )$
 
   - repo: https://github.com/btford/write-good
-    rev: master
+    rev: v1.0.4
     hooks:
       # Files listed below break the following write-good rules:
       #   - adverb weakens meaning
@@ -49,7 +49,7 @@ repos:
         files: docs/jjb/lf-ci-jobs.rst
 
   - repo: https://github.com/btford/write-good
-    rev: master
+    rev: v1.0.4
     hooks:
       # Files listed below break the following write-good rules:
       #   - is wordy or unneeded

diff --git a/releasenotes/notes/logs-deploy-enable-venv-0b69d64e1f8b18a5.yaml b/releasenotes/notes/logs-deploy-enable-venv-0b69d64e1f8b18a5.yaml
new file mode 100644 (file)
index 0000000..d2ffbae
--- /dev/null
+++ b/releasenotes/notes/logs-deploy-enable-venv-0b69d64e1f8b18a5.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Activate lftools env before processing the logs-deploy script.
+    This will allow us to fetch the latest version of pyOpenSSL and cryptography
+    to resolve the following issue https://github.com/pyca/pyopenssl/issues/973

diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh
index 2009c32..7522e81 100644 (file)
--- a/shell/logs-deploy.sh
+++ b/shell/logs-deploy.sh
@@ -10,10 +10,20 @@
 ##############################################################################
 echo "---> logs-deploy.sh"
 
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+lf-activate-venv lftools
+
 # Ensure we fail the job if any steps fail
 # Disable 'globbing'
 set -euf -o pipefail
 
+# The 'lftool deploy archives' command below expects the archives
+# directory to exist.  Normally lf-infra-sysstat or similar would
+# create it and add content, but to make sure this script is
+# self-contained, we ensure it exists here.
+mkdir -p "$WORKSPACE/archives"
+
 function get_pattern_opts()
 {
     opts=()