From 83fc86d114531efa608883fb7262c52b5bb2f46d Mon Sep 17 00:00:00 2001 From: Nicolas Hicher Date: Wed, 1 Nov 2017 16:06:56 -0400 Subject: [PATCH] Remove ara job move the check/gate jobs on openstack/ara project for zuulv3 migration FYI, openstack-ansible jobs have already been removed [1] in a prior commit [1]: https://review.openstack.org/#/c/514592/ Depends-On: I08d6f1d78425943503df311ee433e5b99971cc10 Depends-On: I841d8d16443db6fde62e8b995ef968c84dbe8a99 Change-Id: Id81187beb3ffd9c1234e666649c3726c6ae5322c --- .../post.yaml | 15 ---- .../run.yaml | 82 ------------------- .../post.yaml | 15 ---- .../run.yaml | 82 ------------------- .../post.yaml | 15 ---- .../run.yaml | 52 ------------ .../post.yaml | 15 ---- .../run.yaml | 52 ------------ .../post.yaml | 15 ---- .../run.yaml | 52 ------------ .../post.yaml | 15 ---- .../run.yaml | 52 ------------ .../ara-integration-py35-devel/post.yaml | 15 ---- .../ara-integration-py35-devel/run.yaml | 51 ------------ .../post.yaml | 15 ---- .../run.yaml | 52 ------------ .../ara-integration-py35-latest/post.yaml | 15 ---- .../ara-integration-py35-latest/run.yaml | 51 ------------ zuul.d/zuul-legacy-jobs.yaml | 79 ------------------ 19 files changed, 740 deletions(-) delete mode 100644 playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/post.yaml delete mode 100644 playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/run.yaml delete mode 100644 playbooks/legacy/ara-integration-openstack-ansible-func/post.yaml delete mode 100644 playbooks/legacy/ara-integration-openstack-ansible-func/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py27-devel-centos-7/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py27-devel-centos-7/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py27-latest-centos-7/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py27-latest-centos-7/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-devel-fedora-26/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-devel-fedora-26/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-devel/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-devel/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-latest-fedora-26/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-latest-fedora-26/run.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-latest/post.yaml delete mode 100644 playbooks/legacy/ara-integration-py35-latest/run.yaml diff --git a/playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/post.yaml b/playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/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/ara-integration-openstack-ansible-func-centos-7/run.yaml b/playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/run.yaml deleted file mode 100644 index 98ca0afc..00000000 --- a/playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/run.yaml +++ /dev/null @@ -1,82 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-openstack-ansible-func-centos-7 from - old job gate-ara-integration-openstack-ansible-func-centos-7-nv - 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 { - rm -f $CLONEMAP - rm -rf $REQS_DIR - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/openstack-ansible-tests - dest: . - - name: openstack/requirements - dest: $REQS_DIR - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \ - --cache-dir /opt/git git://git.openstack.org \ - openstack/openstack-ansible-tests \ - openstack/requirements - cp $REQS_DIR/upper-constraints.txt ./ - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - # NOTE(mhayden): The CentOS CI image has many repositories enabled by - # default that can cause package conflicts. We must disable all of - # them here and only enable base, updates, and epel. - if [[ -e /usr/bin/yum ]] && [[ -x /usr/bin/yum-config-manager ]]; then - sudo yum-config-manager --disable \* - sudo yum-config-manager --enable base - sudo yum-config-manager --enable epel - sudo yum-config-manager --enable updates - fi - 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: | - # NOTE(mhayden): EPEL is no longer required after installing distro - # packages with bindep. Individual roles may re-enable EPEL if they - # need it for their package installation tasks. - if [[ -e /usr/bin/yum ]] && [[ -x /usr/bin/yum-config-manager ]]; then - sudo yum-config-manager --disable epel - fi - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - # Allow Jenkins user to ssh into localhost - ssh-keygen -f ~/.ssh/id_rsa -N "" - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys - ssh-keyscan localhost >> ~/.ssh/known_hosts - ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - /usr/local/jenkins/slave_scripts/run-tox.sh functional - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-openstack-ansible-func/post.yaml b/playbooks/legacy/ara-integration-openstack-ansible-func/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-openstack-ansible-func/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/ara-integration-openstack-ansible-func/run.yaml b/playbooks/legacy/ara-integration-openstack-ansible-func/run.yaml deleted file mode 100644 index 7bd6cf7c..00000000 --- a/playbooks/legacy/ara-integration-openstack-ansible-func/run.yaml +++ /dev/null @@ -1,82 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-openstack-ansible-func from old job - gate-ara-integration-openstack-ansible-func-ubuntu-xenial-nv - 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 { - rm -f $CLONEMAP - rm -rf $REQS_DIR - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: openstack/openstack-ansible-tests - dest: . - - name: openstack/requirements - dest: $REQS_DIR - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \ - --cache-dir /opt/git git://git.openstack.org \ - openstack/openstack-ansible-tests \ - openstack/requirements - cp $REQS_DIR/upper-constraints.txt ./ - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - # NOTE(mhayden): The CentOS CI image has many repositories enabled by - # default that can cause package conflicts. We must disable all of - # them here and only enable base, updates, and epel. - if [[ -e /usr/bin/yum ]] && [[ -x /usr/bin/yum-config-manager ]]; then - sudo yum-config-manager --disable \* - sudo yum-config-manager --enable base - sudo yum-config-manager --enable epel - sudo yum-config-manager --enable updates - fi - 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: | - # NOTE(mhayden): EPEL is no longer required after installing distro - # packages with bindep. Individual roles may re-enable EPEL if they - # need it for their package installation tasks. - if [[ -e /usr/bin/yum ]] && [[ -x /usr/bin/yum-config-manager ]]; then - sudo yum-config-manager --disable epel - fi - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - # Allow Jenkins user to ssh into localhost - ssh-keygen -f ~/.ssh/id_rsa -N "" - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys - ssh-keyscan localhost >> ~/.ssh/known_hosts - ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - /usr/local/jenkins/slave_scripts/run-tox.sh functional - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/post.yaml b/playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/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/ara-integration-py27-2.2.3.0-centos-7/run.yaml b/playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/run.yaml deleted file mode 100644 index c82e2973..00000000 --- a/playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py27-2.2.3.0-centos-7 from old job - gate-ara-integration-py27-2.2.3.0-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py27 --ansible 2.2.3.0 - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py27-devel-centos-7/post.yaml b/playbooks/legacy/ara-integration-py27-devel-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py27-devel-centos-7/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/ara-integration-py27-devel-centos-7/run.yaml b/playbooks/legacy/ara-integration-py27-devel-centos-7/run.yaml deleted file mode 100644 index f7d8b5aa..00000000 --- a/playbooks/legacy/ara-integration-py27-devel-centos-7/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py27-devel-centos-7 from old job - gate-ara-integration-py27-devel-centos-7-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py27 --ansible devel - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py27-latest-centos-7/post.yaml b/playbooks/legacy/ara-integration-py27-latest-centos-7/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py27-latest-centos-7/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/ara-integration-py27-latest-centos-7/run.yaml b/playbooks/legacy/ara-integration-py27-latest-centos-7/run.yaml deleted file mode 100644 index 337078d1..00000000 --- a/playbooks/legacy/ara-integration-py27-latest-centos-7/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py27-latest-centos-7 from old job - gate-ara-integration-py27-latest-centos-7 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py27 --ansible latest - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py35-devel-fedora-26/post.yaml b/playbooks/legacy/ara-integration-py35-devel-fedora-26/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py35-devel-fedora-26/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/ara-integration-py35-devel-fedora-26/run.yaml b/playbooks/legacy/ara-integration-py35-devel-fedora-26/run.yaml deleted file mode 100644 index 2e7d2588..00000000 --- a/playbooks/legacy/ara-integration-py35-devel-fedora-26/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py35-devel-fedora-26 from old job - gate-ara-integration-py35-devel-fedora-26-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py35 --ansible devel - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py35-devel/post.yaml b/playbooks/legacy/ara-integration-py35-devel/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py35-devel/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/ara-integration-py35-devel/run.yaml b/playbooks/legacy/ara-integration-py35-devel/run.yaml deleted file mode 100644 index b6859cee..00000000 --- a/playbooks/legacy/ara-integration-py35-devel/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py35-devel from old job gate-ara-integration-py35-devel-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py35 --ansible devel - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py35-latest-fedora-26/post.yaml b/playbooks/legacy/ara-integration-py35-latest-fedora-26/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py35-latest-fedora-26/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/ara-integration-py35-latest-fedora-26/run.yaml b/playbooks/legacy/ara-integration-py35-latest-fedora-26/run.yaml deleted file mode 100644 index 404b8e9c..00000000 --- a/playbooks/legacy/ara-integration-py35-latest-fedora-26/run.yaml +++ /dev/null @@ -1,52 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py35-latest-fedora-26 from old job - gate-ara-integration-py35-latest-fedora-26 - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py35 --ansible latest - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/ara-integration-py35-latest/post.yaml b/playbooks/legacy/ara-integration-py35-latest/post.yaml deleted file mode 100644 index e07f5510..00000000 --- a/playbooks/legacy/ara-integration-py35-latest/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/ara-integration-py35-latest/run.yaml b/playbooks/legacy/ara-integration-py35-latest/run.yaml deleted file mode 100644 index 425451cf..00000000 --- a/playbooks/legacy/ara-integration-py35-latest/run.yaml +++ /dev/null @@ -1,51 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-ara-integration-py35-latest from old job gate-ara-integration-py35-latest-ubuntu-xenial - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - CLONEMAP=`mktemp` - function cleanup { - # In cases where zuul-cloner is aborted during a git - # clone operation, git will remove the git work tree in - # its cleanup. The work tree in these jobs is the - # workspace directory, which means that subsequent - # jenkins post-build actions can not run because the - # workspace has been removed. - # To reduce the likelihood of this having an impact, - # recreate the workspace directory if needed - mkdir -p $WORKSPACE - rm -f $CLONEMAP - } - trap cleanup EXIT - cat > $CLONEMAP << EOF - clonemap: - - name: $ZUUL_PROJECT - dest: . - EOF - /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT - 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: | - set -e - set -x - ./run_tests.sh --python py35 --ansible latest - 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 7cb2b6a8..2d24fdca 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -69,85 +69,6 @@ post-run: playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/post.yaml timeout: 2400 -- job: - name: legacy-ara-integration-openstack-ansible-func - parent: legacy-base - run: playbooks/legacy/ara-integration-openstack-ansible-func/run.yaml - post-run: playbooks/legacy/ara-integration-openstack-ansible-func/post.yaml - timeout: 3600 - required-projects: - - openstack/ara - - openstack/openstack-ansible - - openstack/openstack-ansible-tests - - openstack/requirements - -- job: - name: legacy-ara-integration-openstack-ansible-func-centos-7 - parent: legacy-base - run: playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/run.yaml - post-run: playbooks/legacy/ara-integration-openstack-ansible-func-centos-7/post.yaml - timeout: 3600 - nodeset: legacy-centos-7 - required-projects: - - openstack/ara - - openstack/openstack-ansible - - openstack/openstack-ansible-tests - - openstack/requirements - -- job: - name: legacy-ara-integration-py27-2.2.3.0-centos-7 - parent: legacy-base - run: playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/run.yaml - post-run: playbooks/legacy/ara-integration-py27-2.2.3.0-centos-7/post.yaml - timeout: 1200 - nodeset: legacy-centos-7 - -- job: - name: legacy-ara-integration-py27-devel-centos-7 - parent: legacy-base - run: playbooks/legacy/ara-integration-py27-devel-centos-7/run.yaml - post-run: playbooks/legacy/ara-integration-py27-devel-centos-7/post.yaml - timeout: 1200 - nodeset: legacy-centos-7 - -- job: - name: legacy-ara-integration-py27-latest-centos-7 - parent: legacy-base - run: playbooks/legacy/ara-integration-py27-latest-centos-7/run.yaml - post-run: playbooks/legacy/ara-integration-py27-latest-centos-7/post.yaml - timeout: 1200 - nodeset: legacy-centos-7 - -- job: - name: legacy-ara-integration-py35-devel - parent: legacy-base - run: playbooks/legacy/ara-integration-py35-devel/run.yaml - post-run: playbooks/legacy/ara-integration-py35-devel/post.yaml - timeout: 1200 - -- job: - name: legacy-ara-integration-py35-devel-fedora-26 - parent: legacy-base - run: playbooks/legacy/ara-integration-py35-devel-fedora-26/run.yaml - post-run: playbooks/legacy/ara-integration-py35-devel-fedora-26/post.yaml - timeout: 1200 - nodeset: legacy-fedora-26 - -- job: - name: legacy-ara-integration-py35-latest - parent: legacy-base - run: playbooks/legacy/ara-integration-py35-latest/run.yaml - post-run: playbooks/legacy/ara-integration-py35-latest/post.yaml - timeout: 1200 - -- job: - name: legacy-ara-integration-py35-latest-fedora-26 - parent: legacy-base - run: playbooks/legacy/ara-integration-py35-latest-fedora-26/run.yaml - post-run: playbooks/legacy/ara-integration-py35-latest-fedora-26/post.yaml - timeout: 1200 - nodeset: legacy-fedora-26 - - job: name: legacy-astara-appliance-buildimage parent: legacy-publish-openstack-artifacts