From ae8af0c891cc58ea1b60783f64eab14d7c1bb1f0 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 10 Nov 2017 11:38:58 +0000 Subject: [PATCH] Partial Revert "Remove now obsolete npm jobs" Readd the npm-run-test jobs and use them in the nodejs project-templates until we have the run-test job fixed. This partially reverts commit 6b2d2048b1aaca2e6be502beb050664ed06ae69e. Partial-Bug: #1731421 Change-Id: I8c00c1a10daaa95824846e529e98ff18804f5898 --- .../legacy/nodejs4-npm-run-test/post.yaml | 54 +++++++ .../legacy/nodejs4-npm-run-test/run.yaml | 148 ++++++++++++++++++ .../legacy/nodejs6-npm-run-test/post.yaml | 54 +++++++ .../legacy/nodejs6-npm-run-test/run.yaml | 148 ++++++++++++++++++ zuul.d/project-templates.yaml | 16 +- zuul.d/zuul-legacy-jobs.yaml | 15 ++ 6 files changed, 423 insertions(+), 12 deletions(-) create mode 100644 playbooks/legacy/nodejs4-npm-run-test/post.yaml create mode 100644 playbooks/legacy/nodejs4-npm-run-test/run.yaml create mode 100644 playbooks/legacy/nodejs6-npm-run-test/post.yaml create mode 100644 playbooks/legacy/nodejs6-npm-run-test/run.yaml diff --git a/playbooks/legacy/nodejs4-npm-run-test/post.yaml b/playbooks/legacy/nodejs4-npm-run-test/post.yaml new file mode 100644 index 00000000..e38d86d9 --- /dev/null +++ b/playbooks/legacy/nodejs4-npm-run-test/post.yaml @@ -0,0 +1,54 @@ +- 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/nodejs4-npm-run-test/run.yaml b/playbooks/legacy/nodejs4-npm-run-test/run.yaml new file mode 100644 index 00000000..18964102 --- /dev/null +++ b/playbooks/legacy/nodejs4-npm-run-test/run.yaml @@ -0,0 +1,148 @@ +- hosts: all + name: Autoconverted job legacy-nodejs4-npm-run-test from old job gate-{name}-nodejs4-npm-run-test + 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 =~ (^| )test($| ) ]]; then + npm test --verbose + else + npm run test --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/nodejs6-npm-run-test/post.yaml b/playbooks/legacy/nodejs6-npm-run-test/post.yaml new file mode 100644 index 00000000..e38d86d9 --- /dev/null +++ b/playbooks/legacy/nodejs6-npm-run-test/post.yaml @@ -0,0 +1,54 @@ +- 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/nodejs6-npm-run-test/run.yaml b/playbooks/legacy/nodejs6-npm-run-test/run.yaml new file mode 100644 index 00000000..44dae4ec --- /dev/null +++ b/playbooks/legacy/nodejs6-npm-run-test/run.yaml @@ -0,0 +1,148 @@ +- hosts: all + name: Autoconverted job legacy-nodejs6-npm-run-test from old job gate-{name}-nodejs6-npm-run-test + 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_6.x $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list + echo "deb-src https://deb.nodesource.com/node_6.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 =~ (^| )test($| ) ]]; then + npm test --verbose + else + npm run test --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/project-templates.yaml b/zuul.d/project-templates.yaml index fc0cc37a..a7886c06 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -718,17 +718,13 @@ - nodejs-npm-run-lint: vars: node_version: 4 - - nodejs-npm-run-test: - vars: - node_version: 4 + - legacy-nodejs4-npm-run-test gate: jobs: - nodejs-npm-run-lint: vars: node_version: 4 - - nodejs-npm-run-test: - vars: - node_version: 4 + - legacy-nodejs4-npm-run-test - project-template: name: nodejs6-jobs @@ -739,17 +735,13 @@ - nodejs-npm-run-lint: vars: node_version: 6 - - nodejs-npm-run-test: - vars: - node_version: 6 + - legacy-nodejs6-npm-run-test gate: jobs: - nodejs-npm-run-lint: vars: node_version: 6 - - nodejs-npm-run-test: - vars: - node_version: 6 + - legacy-nodejs6-npm-run-test - project-template: name: nodejs4-docs diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml index 6f710b65..972790c7 100644 --- a/zuul.d/zuul-legacy-jobs.yaml +++ b/zuul.d/zuul-legacy-jobs.yaml @@ -3224,6 +3224,21 @@ - openstack/neutron - openstack/python-neutronclient +- job: + name: legacy-nodejs4-npm-run-test + parent: legacy-base + run: playbooks/legacy/nodejs4-npm-run-test/run.yaml + post-run: playbooks/legacy/nodejs4-npm-run-test/post.yaml + timeout: 2400 + branches: ^(?!stable/newton).*$ + +- job: + name: legacy-nodejs6-npm-run-test + parent: legacy-base + run: playbooks/legacy/nodejs6-npm-run-test/run.yaml + post-run: playbooks/legacy/nodejs6-npm-run-test/post.yaml + timeout: 2400 + - job: name: legacy-nova-api-ref-src parent: legacy-base