986bf1685a
We have 2 branches in the vmtp stackforge repository: master and kloudbuster These 2 guys need to get in sync from time to time I need to sync kloudbuster to its parent branch (i.e. pick up the few changes that were committed in master and commit them to kloudbuster). When I try to push the merge commit to gerrit I get this error from gerrit: (venv) AHOTHAN-M-V0CS:scale ahothan$ git review kloudbuster remote: Resolving deltas: 100% (1/1) remote: Processing changes: refs: 1, done To ssh://ahothan@review.openstack.org:29418/stackforge/vmtp.git ! [remote rejected] HEAD -> refs/publish/kloudbuster (you are not allowed to upload merges) Which shows that I do not have the permission to push a merge commit. So I need to add that permission to the vmtp acl file for gerrit in order to merge I see only 2 other stackforge repos have pushMerge permission since they also have branches to tend to. Most repost in stackforge do not need this because they put all their eggs in the master branch. Hope that is clear enough and waiting impatiently for +2 Change-Id: Idc9a950b226df576d684e125845f6a6de340681c
OpenStack Infra Config Files
This repo contains a set of config files that are consumed by the openstack-infra/system-config puppet modules in order to deploy and configure the OpenStack Infrastructure. You should edit these files to make configuration changes to the OpenStack Infrastructure.
accessbot
This dir contains the IRC access bot channel config. This config file is used to specify which channels are managed by the infra team and the permissions assigned to nicks in those channels.
gerrit
This dir contains the main project registry in projects.yaml along with all of the gerrit project ACLs in the acls subdir. You will need to edit these files to add new projects to Gerrit.
See the StackForge Documentation for info on adding projects.
gerritbot
This dir contains the gerritbot channel config file. Edit this file to add the gerritbot to your IRC channels for gerrit event messages.
jenkins
This dir contains the Jenkins job definitions as supplied to Jenkins Job Builder as well as the scripts used in many of the jobs. Edit these files if you need to add/delete/modify Jenkins Jobs.
Jenkins Documentation Jenkins Job Builder Documentation
nodepool
This dir contains the nodepool scripts and nodepool disk image builder elements that are used to build the images we boot slave nodes off of. Edit these files if you need to modify the base images that Jenkins jobs run on.
specs
This dir contains the index.html file for the http://specs.openstack.org site. Edit this file if you are adding and removing projects from that site.
Static Web Hosting Documentation
zuul
This dir contains the zuul layout.yaml file and its python functions file(s). These files determine what jobs are run on Gerrit events for each project. Edit these files if you need to change the jobs that your project runs or attributes of those jobs (voting, slave node type, etc).
dev
This dir contains config files for the development deployments of the above services.