Fix npm publishing

During the conversion, the nodejs4-publish-to-npm template was replaced
with python publishing jobs by accident.

Really use nodejs4-publish-to-npm for the publishing and remove thus
legacy-npm-upload and publish-openstack-python-tarball for npm repos.

Remove also npm-tarball-upload.sh, it is only used by the
legacy-npm-upload job and thus not needed anymore.

For reference, see
http://git.openstack.org/cgit/openstack-infra/project-config/tree/zuul/layout.yaml?h=before-jenkins-config-removed
and check the templates used by the projects changed.

Needed-By: I696a23792f8e4056b788ad4a8b018c423aa1af68
Change-Id: I5cccd00518afcc50c575a4bb1937345a30fe584f
This commit is contained in:
Andreas Jaeger 2017-12-15 12:08:10 +01:00
parent e57f17fdb6
commit 139c6eab98
2 changed files with 7 additions and 79 deletions

View File

@ -1,34 +0,0 @@
#!/bin/bash -xe
#
# Copyright 2015 Hewlett-Packard Development Company, L.P.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# Retrieve a javascript sdist and upload it to npm.
PROJECT=$1
TARBALL_SITE=$2
TAG=$(echo $ZUUL_REF | sed 's/^refs.tags.//')
# Build the filename from the discovered tag and projectname.
FILENAME="$PROJECT-$TAG.tar.gz"
rm -rf *tgz
curl --fail -o $FILENAME http://$TARBALL_SITE/$PROJECT/$FILENAME
# Make sure we actually got a gzipped file
file -b $FILENAME | grep gzip
# Perform an NPM publish of the provided package, without executing any
# lifecycle scripts.
npm publish --ignore-scripts $FILENAME

View File

@ -766,13 +766,7 @@
templates:
- system-required
- nodejs4-jobs
- publish-to-pypi
release:
jobs:
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- nodejs4-publish-to-npm
- project:
name: openstack-infra/js-generator-openstack
@ -780,7 +774,7 @@
- system-required
- nodejs4-jobs
- nodejs4-docs
- publish-to-pypi
- nodejs4-publish-to-npm
pre-release:
jobs:
- legacy-js-generator-openstack-nodejs6-npm-docs:
@ -789,23 +783,13 @@
jobs:
- legacy-js-generator-openstack-nodejs6-npm-docs:
branches: ^(?!bug/).*$
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- project:
name: openstack-infra/js-openstack-registry-hooks
templates:
- system-required
- nodejs4-jobs
- publish-to-pypi
release:
jobs:
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- nodejs4-publish-to-npm
- project:
name: openstack-infra/lodgeit
@ -5112,13 +5096,7 @@
- nodejs4-jobs
- nodejs4-docs
- publish-openstack-sphinx-docs
- publish-to-pypi
release:
jobs:
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- nodejs4-publish-to-npm
- project:
name: openstack/evoque
@ -7375,7 +7353,7 @@
- nodejs4-jobs
- nodejs6-jobs
- nodejs6-docs
- publish-to-pypi
- nodejs4-publish-to-npm
check:
jobs:
- legacy-js-openstack-lib-dsvm-nodejs6-npm-run-functional-test
@ -7392,10 +7370,6 @@
jobs:
- legacy-js-openstack-lib-nodejs6-npm-sdk-docs:
branches: ^(?!bug/).*$
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- project:
name: openstack/k8s-cloud-provider
@ -7455,13 +7429,7 @@
templates:
- system-required
- nodejs4-jobs
- publish-to-pypi
release:
jobs:
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- nodejs4-publish-to-npm
- project:
name: openstack/keystone
@ -15950,13 +15918,7 @@
templates:
- system-required
- nodejs4-jobs
- publish-to-pypi
release:
jobs:
- publish-openstack-python-tarball
- legacy-npm-upload:
dependencies:
- publish-openstack-python-tarball
- nodejs4-publish-to-npm
- project:
name: openstack/shovel-horizon