diff options
author | Luigi Toscano <ltoscano@redhat.com> | 2020-07-29 20:14:40 +0200 |
---|---|---|
committer | Luigi Toscano <ltoscano@redhat.com> | 2020-07-29 20:14:40 +0200 |
commit | 63c1eca0094e0d1ce9b2a15db3a5c39c820b05f7 (patch) | |
tree | db22259807a8ea35f68aa05641b4effd9bb02311 | |
parent | 0a2dc7096bcdb83431e0c6e9b73800540596956e (diff) | |
download | oslo-log-63c1eca0094e0d1ce9b2a15db3a5c39c820b05f7.tar.gz |
zuul: port the legacy grenade job
Make it a native Zuul v3 job.
It is a simple variant of the base 'grenade' job where oslo.log
is installed from source instead of pip.
Also use a slightly more common name by dropping the "-devstack"
suffix (all grenade jobs are also devstack jobs).
Change-Id: I2f335358dd467f57a2178df66414bdc634eb6400
-rw-r--r-- | .zuul.yaml | 13 | ||||
-rw-r--r-- | playbooks/legacy/oslo.log-src-grenade-devstack/post.yaml | 15 | ||||
-rw-r--r-- | playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml | 51 |
3 files changed, 4 insertions, 75 deletions
@@ -1,17 +1,12 @@ - job: - name: oslo.log-src-grenade-devstack - parent: legacy-dsvm-base + name: oslo.log-src-grenade + parent: grenade voting: false irrelevant-files: - ^(test-|)requirements.txt$ - ^setup.cfg$ - post-run: playbooks/legacy/oslo.log-src-grenade-devstack/post.yaml required-projects: - - openstack/grenade - - openstack/devstack-gate - - openstack/oslo.log - run: playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml - timeout: 10800 + - opendev.org/openstack/oslo.log - job: name: oslo.log-jsonformatter @@ -44,7 +39,7 @@ - project: check: jobs: - - oslo.log-src-grenade-devstack + - oslo.log-src-grenade - oslo.log-jsonformatter gate: jobs: diff --git a/playbooks/legacy/oslo.log-src-grenade-devstack/post.yaml b/playbooks/legacy/oslo.log-src-grenade-devstack/post.yaml deleted file mode 100644 index e07f551..0000000 --- a/playbooks/legacy/oslo.log-src-grenade-devstack/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml b/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml deleted file mode 100644 index c3fab23..0000000 --- a/playbooks/legacy/oslo.log-src-grenade-devstack/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oslo.log-src-grenade-dsvm from old job gate-oslo.log-src-grenade-dsvm-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - https://opendev.org \ - openstack/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/grenade $PROJECTS" - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_GRENADE=pullup - export DEVSTACK_GATE_USE_PYTHON3=True - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME - - # Even if the branch is overridden, make sure we use - # the correct branch using the OVERRIDE_*_PROJECT_BRANCH - # variable. - uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'` - export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' |