diff --git a/playbooks/legacy/oaktree-dsvm-functional/post.yaml b/playbooks/legacy/oaktree-dsvm-functional/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/oaktree-dsvm-functional/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/oaktree-dsvm-functional/run.yaml b/playbooks/legacy/oaktree-dsvm-functional/run.yaml deleted file mode 100644 index ecdca4dc..00000000 --- a/playbooks/legacy/oaktree-dsvm-functional/run.yaml +++ /dev/null @@ -1,66 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oaktree-dsvm-functional from old job gate-oaktree-dsvm-functional - 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-infra/devstack-gate - dest: devstack-gate - EOF - /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - cat << 'EOF' >>"/tmp/dg-local.conf" - [[local|localrc]] - enable_plugin oaktree git://git.openstack.org/openstack/oaktree - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export GOPATH=$HOME/go - export PATH=$GOPATH/bin:$PATH - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=1 - - export DEVSTACK_PROJECT_FROM_GIT="shade" - export DEVSTACK_PROJECT_FROM_GIT+=",oaktree" - export DEVSTACK_PROJECT_FROM_GIT+=",oaktreemodel" - - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - function post_test_hook { - python $BASE/new/oaktree/devstack/test.py - } - export -f post_test_hook - - 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 }}' diff --git a/playbooks/legacy/oaktreemodel-distcheck/run.yaml b/playbooks/legacy/oaktreemodel-distcheck/run.yaml deleted file mode 100644 index 60721f5c..00000000 --- a/playbooks/legacy/oaktreemodel-distcheck/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-oaktreemodel-distcheck from old job oaktreemodel-distcheck - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - REQS_DIR=`mktemp -d` - function cleanup { - mkdir -p $WORKSPACE - rm -rf $CLONEMAP $REQS_DIR - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - # zuul cloner works poorly if there are 2 names that are the - # same in here. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cat >> $CLONEMAP << EOF - - name: openstack/requirements - dest: $REQS_DIR - EOF - fi - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT openstack/requirements - # REQS_DIR is not set for openstack/requirements and there is also - # no need to copy in this case. - if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then - cp $REQS_DIR/upper-constraints.txt ./ - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo pip install grpcio grpcio-tools pbr - export GOPATH=$HOME/go - export PATH=$GOPATH/bin:$PATH - ./install_proto3.sh - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -x - sudo rm -f /etc/sudoers.d/zuul - # Prove that general sudo access is actually revoked - ! sudo -n true - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export GOPATH=$HOME/go - export PATH=$GOPATH/bin:$PATH - ./bootstrap.sh - ./configure - make - # There should be no changes to files as a result of running make. - # Most likely cause of changes is forgetting to update go files. - git diff --stat --exit-code HEAD - make distcheck - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 54079dad..eb47985a 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -2614,24 +2614,6 @@ dependencies: - publish-openstack-python-tarball -- job: - name: legacy-oaktree-dsvm-functional - parent: legacy-dsvm-base - run: playbooks/legacy/oaktree-dsvm-functional/run.yaml - post-run: playbooks/legacy/oaktree-dsvm-functional/post.yaml - timeout: 4200 - required-projects: - - openstack-infra/devstack-gate - - openstack-infra/shade - - openstack/oaktree - - openstack/oaktreemodel - -- job: - name: legacy-oaktreemodel-distcheck - parent: legacy-base - run: playbooks/legacy/oaktreemodel-distcheck/run.yaml - timeout: 1800 - - job: name: legacy-omni-tests parent: legacy-base