From 840af24ab106f5ed02e9eb138b3779c9755cdb0a Mon Sep 17 00:00:00 2001 From: Christopher Aedo Date: Fri, 11 Sep 2015 17:22:22 -0700 Subject: [PATCH] Update repo references This commit updates references to the repo after it was moved from stackforge to openstack namespace. Change-Id: Id1c762d7e17450787ffb3742095609536c086ec5 --- README.rst | 2 +- deployment/README.md | 18 +++++++++++------- .../modules/catalog_ci/files/jobs/job.yaml | 8 ++++---- openstack_catalog/web/index.html | 2 +- package.json | 4 ++-- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index af9852e..41c5871 100644 --- a/README.rst +++ b/README.rst @@ -39,7 +39,7 @@ Project Info ------------ * Web-site: http://apps.openstack.org - * Source: http://git.openstack.org/cgit/stackforge/apps-catalog + * Source: http://git.openstack.org/cgit/openstack/app-catalog * Wiki: https://wiki.openstack.org/wiki/App-Catalog * Launchpad: https://launchpad.net/app-catalog * Blueprints: https://blueprints.launchpad.net/app-catalog diff --git a/deployment/README.md b/deployment/README.md index 2074b1b..2305719 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -1,14 +1,17 @@ -apps-catalog-ci -======== +app-catalog-ci +=============== + Description ----------------------- -This is a collection of deployment scripts for apps-catalog CI project. +----------- + +This is a collection of deployment scripts for app-catalog CI project. It consists of Puppet module catalog_ci and an additional shell script. The scripts allow to setup Jenkins with access to Gerrit to trigger -appropriate jobs on a commit to the apps-catalog project. +appropriate jobs on a commit to the app-catalog project. Deployment ----------------------- +---------- + Execute deploy.sh script to begin deployment: (some operations require superuser access rights) @@ -36,7 +39,8 @@ The following steps are required after deployment: in order to use it. Jenkins Jobs ----------------------- +------------ + Jenkins Job Builder is used to configure Jenkins jobs. It will be automatically installed by deployment scripts. Jobs configuration files will be placed to /etc/jenkins_jobs/jobs. You can use the following command to apply your changes diff --git a/deployment/catalog-ci-jenkins/modules/catalog_ci/files/jobs/job.yaml b/deployment/catalog-ci-jenkins/modules/catalog_ci/files/jobs/job.yaml index 7ec076e..dbf2e9e 100644 --- a/deployment/catalog-ci-jenkins/modules/catalog_ci/files/jobs/job.yaml +++ b/deployment/catalog-ci-jenkins/modules/catalog_ci/files/jobs/job.yaml @@ -9,7 +9,7 @@ scm: - git: - url: https://git.openstack.org/stackforge/apps-catalog + url: https://git.openstack.org/openstack/app-catalog refspec: $GERRIT_REFSPEC name: choosing-strategy: gerrit @@ -24,7 +24,7 @@ trigger-on-patchset-uploaded-event: true projects: - project-compare-type: 'PLAIN' - project-pattern: 'stackforge/apps-catalog' + project-pattern: 'openstack/app-catalog' branch-compare-type: 'PLAIN' branch-pattern: master @@ -43,7 +43,7 @@ scm: - git: - url: https://git.openstack.org/stackforge/apps-catalog + url: https://git.openstack.org/openstack/app-catalog refspec: $GERRIT_REFSPEC name: choosing-strategy: gerrit @@ -58,7 +58,7 @@ trigger-on-change-merged-event: true projects: - project-compare-type: 'PLAIN' - project-pattern: 'stackforge/apps-catalog' + project-pattern: 'openstack/app-catalog' branch-compare-type: 'PLAIN' branch-pattern: master diff --git a/openstack_catalog/web/index.html b/openstack_catalog/web/index.html index 08a65b8..ff63e64 100644 --- a/openstack_catalog/web/index.html +++ b/openstack_catalog/web/index.html @@ -207,7 +207,7 @@

Contributing to the OpenStack Application Catalog

The application catalog is built from the YAML files found in the - repository. + repository. Consistent with other OpenStack projects, additions to the catalog take the form of git commits which are reviewed with Gerrit prior to being merged. Detailed instructions for adding to diff --git a/package.json b/package.json index 1ce3cf0..f1d4ea7 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "version": "0.0.0", "private": true, - "name": "apps-catalog", - "description": "OpenStack Apps Catalog", + "name": "app-catalog", + "description": "OpenStack App Catalog", "repository": "none", "license": "Apache 2.0", "devDependencies": {