From d47bb8365ae8851c3c9e110e5bac00b7f1710412 Mon Sep 17 00:00:00 2001 From: Christopher Aedo Date: Sat, 9 Dec 2017 09:16:21 -0800 Subject: [PATCH] Retiring App Catalog This commit removes legacy review jobs associated with the app catalog. This is part of the first step, following the guide at: https://docs.openstack.org/infra/manual/drivers.html#retiring-a-project Earlier this year the TC agreed to retire this project: https://review.openstack.org/#/c/452086/ In July, Fungi sent a note to the operators list as well: http://lists.openstack.org/pipermail/openstack-operators/2017-July/013965.html Depends-On: I52ce13057643d69a0fd87bce20ee460c6b7c2f17 Change-Id: I8df56c5ef22392ee818a417a0d3eff40463c3f47 --- .../post.yaml | 54 ------- .../app-catalog-nodejs4-npm-run-lint/run.yaml | 148 ----------------- .../app-catalog-ui-dsvm-integration/post.yaml | 93 ----------- .../app-catalog-ui-dsvm-integration/run.yaml | 81 ---------- .../post.yaml | 54 ------- .../run.yaml | 149 ------------------ zuul.d/zuul-legacy-jobs.yaml | 25 --- 7 files changed, 604 deletions(-) delete mode 100644 playbooks/legacy/app-catalog-nodejs4-npm-run-lint/post.yaml delete mode 100644 playbooks/legacy/app-catalog-nodejs4-npm-run-lint/run.yaml delete mode 100644 playbooks/legacy/app-catalog-ui-dsvm-integration/post.yaml delete mode 100644 playbooks/legacy/app-catalog-ui-dsvm-integration/run.yaml delete mode 100644 playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/post.yaml delete mode 100644 playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/run.yaml diff --git a/playbooks/legacy/app-catalog-nodejs4-npm-run-lint/post.yaml b/playbooks/legacy/app-catalog-nodejs4-npm-run-lint/post.yaml deleted file mode 100644 index e38d86d9..00000000 --- a/playbooks/legacy/app-catalog-nodejs4-npm-run-lint/post.yaml +++ /dev/null @@ -1,54 +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=/cover/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/reports/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/npm-shrinkwrap.json - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/karma.subunit - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/app-catalog-nodejs4-npm-run-lint/run.yaml b/playbooks/legacy/app-catalog-nodejs4-npm-run-lint/run.yaml deleted file mode 100644 index 85d1ba51..00000000 --- a/playbooks/legacy/app-catalog-nodejs4-npm-run-lint/run.yaml +++ /dev/null @@ -1,148 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-app-catalog-nodejs4-npm-run-lint from old job gate-app-catalog-nodejs4-npm-run-lint - 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 -u - set -e - set -x - # Prerequisites - sudo apt-get update - sudo apt-get install -y apt-transport-https lsb-release curl - - DISTRO=$(lsb_release -c -s) - - # Install via nodesource - curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add - - - echo "deb https://deb.nodesource.com/node_4.x $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list - echo "deb-src https://deb.nodesource.com/node_4.x $DISTRO main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list - - sudo apt-get update - sudo apt-get install -y nodejs - - # Output to the log for debugging sake. - node --version - npm --version - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y xvfb - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y chromium-browser - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y firefox dbus - 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: | - DIMENSIONS='1280x1024x24' - /usr/bin/Xvfb :99 -screen 0 ${DIMENSIONS} -ac +extension GLX +render -noreset 2>&1 > /dev/null & - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -u - set -e - set -x - export DISPLAY=:99 - npm install --verbose - - # Try running as a standard lifecycle script, otherwise try custom. - npm_lifecycle_phases="publish install version test stop start restart pack" - - if [[ $npm_lifecycle_phases =~ (^| )lint($| ) ]]; then - npm lint --verbose - else - npm run lint --verbose - fi - - # If no shrinkwrap exists, generate it. - if [ ! -f ./npm-shrinkwrap.json ]; then - npm prune # https://github.com/npm/npm/issues/6298 - npm shrinkwrap - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - OUT=`git ls-files --other --exclude-standard --directory` - if [ -z "$OUT" ]; then - echo "No extra files created during test." - exit 0 - else - echo "The following un-ignored files were created during the test:" - echo "$OUT" - exit 0 # TODO: change to 1 to fail tests. - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/app-catalog-ui-dsvm-integration/post.yaml b/playbooks/legacy/app-catalog-ui-dsvm-integration/post.yaml deleted file mode 100644 index 4b534ea8..00000000 --- a/playbooks/legacy/app-catalog-ui-dsvm-integration/post.yaml +++ /dev/null @@ -1,93 +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=**/*nose_results.html - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testr_results.html.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/.testrepository/tmp* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=**/*testrepository.subunit.gz - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/tox' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/.tox/*/log/* - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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 - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}/screenshots' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/integration_tests_screenshots/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/app-catalog-ui-dsvm-integration/run.yaml b/playbooks/legacy/app-catalog-ui-dsvm-integration/run.yaml deleted file mode 100644 index 70849c5b..00000000 --- a/playbooks/legacy/app-catalog-ui-dsvm-integration/run.yaml +++ /dev/null @@ -1,81 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-app-catalog-ui-dsvm-integration from old job gate-app-catalog-ui-dsvm-integration - 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: | - sudo apt-get update - sudo apt-get install -y firefox dbus - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y xvfb - 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 app-catalog-ui https://git.openstack.org/openstack/app-catalog-ui - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - export DEVSTACK_GATE_INSTALL_TESTONLY=1 - export DEVSTACK_GATE_NEUTRON=1 - export DEVSTACK_GATE_HORIZON=1 - - # Enable App Catalog Horizon plugin - export PROJECTS="openstack/app-catalog-ui $PROJECTS" - - function pre_test_hook { - $BASE/new/app-catalog-ui/tools/gate/integration/pre_test_hook.sh - } - export -f pre_test_hook - - function post_test_hook { - $BASE/new/app-catalog-ui/tools/gate/integration/post_test_hook.sh - } - 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/app-catalog-ui-nodejs4-npm-run-lint/post.yaml b/playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/post.yaml deleted file mode 100644 index e38d86d9..00000000 --- a/playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/post.yaml +++ /dev/null @@ -1,54 +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=/cover/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/reports/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/npm-shrinkwrap.json - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - 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=/karma.subunit - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/run.yaml b/playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/run.yaml deleted file mode 100644 index 73492de3..00000000 --- a/playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/run.yaml +++ /dev/null @@ -1,149 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-app-catalog-ui-nodejs4-npm-run-lint from old job - gate-app-catalog-ui-nodejs4-npm-run-lint - 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 -u - set -e - set -x - # Prerequisites - sudo apt-get update - sudo apt-get install -y apt-transport-https lsb-release curl - - DISTRO=$(lsb_release -c -s) - - # Install via nodesource - curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add - - - echo "deb https://deb.nodesource.com/node_4.x $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list - echo "deb-src https://deb.nodesource.com/node_4.x $DISTRO main" | sudo tee -a /etc/apt/sources.list.d/nodesource.list - - sudo apt-get update - sudo apt-get install -y nodejs - - # Output to the log for debugging sake. - node --version - npm --version - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y xvfb - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y chromium-browser - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - sudo apt-get update - sudo apt-get install -y firefox dbus - 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: | - DIMENSIONS='1280x1024x24' - /usr/bin/Xvfb :99 -screen 0 ${DIMENSIONS} -ac +extension GLX +render -noreset 2>&1 > /dev/null & - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -u - set -e - set -x - export DISPLAY=:99 - npm install --verbose - - # Try running as a standard lifecycle script, otherwise try custom. - npm_lifecycle_phases="publish install version test stop start restart pack" - - if [[ $npm_lifecycle_phases =~ (^| )lint($| ) ]]; then - npm lint --verbose - else - npm run lint --verbose - fi - - # If no shrinkwrap exists, generate it. - if [ ! -f ./npm-shrinkwrap.json ]; then - npm prune # https://github.com/npm/npm/issues/6298 - npm shrinkwrap - fi - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - OUT=`git ls-files --other --exclude-standard --directory` - if [ -z "$OUT" ]; then - echo "No extra files created during test." - exit 0 - else - echo "The following un-ignored files were created during the test:" - echo "$OUT" - exit 0 # TODO: change to 1 to fail tests. - fi - 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 f2dae510..5989cfc7 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -33,31 +33,6 @@ run: playbooks/legacy/ansible-lint/run.yaml timeout: 1800 -- job: - name: legacy-app-catalog-nodejs4-npm-run-lint - parent: legacy-base - run: playbooks/legacy/app-catalog-nodejs4-npm-run-lint/run.yaml - post-run: playbooks/legacy/app-catalog-nodejs4-npm-run-lint/post.yaml - timeout: 2400 - -- job: - name: legacy-app-catalog-ui-dsvm-integration - parent: legacy-dsvm-base - run: playbooks/legacy/app-catalog-ui-dsvm-integration/run.yaml - post-run: playbooks/legacy/app-catalog-ui-dsvm-integration/post.yaml - timeout: 3600 - required-projects: - - openstack-infra/devstack-gate - - openstack/app-catalog - - openstack/app-catalog-ui - -- job: - name: legacy-app-catalog-ui-nodejs4-npm-run-lint - parent: legacy-base - run: playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/run.yaml - post-run: playbooks/legacy/app-catalog-ui-nodejs4-npm-run-lint/post.yaml - timeout: 2400 - - job: name: legacy-astara-appliance-buildimage parent: legacy-publish-openstack-artifacts