Merge "Move jenkins/data/bindep-fallback.txt"

This commit is contained in:
Zuul 2018-02-22 19:36:12 +00:00 committed by Gerrit Code Review
commit 53754fcb80
5 changed files with 21 additions and 21 deletions

View File

@ -11,11 +11,11 @@
cmd: |
set -e
set -x
sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -11,11 +11,11 @@
cmd: |
set -e
set -x
sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -12,11 +12,11 @@
cmd: |
set -e
set -x
sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -12,11 +12,11 @@
cmd: |
set -e
set -x
sudo bash -c "echo 'ant' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/jenkins/common_data/bindep-fallback.txt"
sudo bash -c "echo 'ant' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'ant-optional' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'default-jdk' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'asciidoc' >> /usr/local/bindep-fallback/bindep-fallback.txt"
sudo bash -c "echo 'nodejs' >> /usr/local/bindep-fallback/bindep-fallback.txt"
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'

View File

@ -24,7 +24,7 @@ elif [ -e other-requirements.txt ] ; then
export PACKAGES=other-requirements.txt
else
# use the bindep fallback list preinstalled on the worker
export PACKAGES=/usr/local/jenkins/common_data/bindep-fallback.txt
export PACKAGES=/usr/local/bindep-fallback/bindep-fallback.txt
fi
# an install loop, retrying to check that all requested packages are obtained