Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Puppet usage from prepare_node.sh script #270

Merged
merged 2 commits into from Jan 3, 2017

Conversation

elyezer
Copy link
Collaborator

@elyezer elyezer commented Jan 3, 2017

The pulp-unittest Puppet module was being used to set up some packages
on the nodepool nodes, now the prepare node will handle the base
packages (gcc, git, etc) and will leave specific ones (rpm-build, tito,
etc) for the jobs which need them.

The pulp-unittest Puppet module was being used to set up some packages
on the nodepool nodes, now the prepare node will handle the base
packages (gcc, git, etc) and will leave specific ones (rpm-build, tito,
etc) for the jobs which need them.
@mention-bot
Copy link

@elyezer, thanks for your PR! By analyzing the history of the files in this pull request, we identified @seandst and @dkliban to be potential reviewers.

@elyezer
Copy link
Collaborator Author

elyezer commented Jan 3, 2017

After this PR the ci/deploy directory can be removed. Below is a command that find git grep entries searching for the files present in the deploy directory. As the result shows we can remove the directory as the only entries which are not inside ci/deploy for the the generict __init__.py and the ones inside ci/jobs are references to cloud-config.txt which is being built by the script ci/jobs/scripts/openstack-provision-machine.sh and not related to the ci/deploy.

$ for file in $(find -L ci/deploy -type f | sed "s|.*/||"); do git grep $file | tee; done 

ci/update-version.py:    # We also have to check the __init__.py files since that is the more pythonic place to put it
ci/update-version.py:find_replace_in_files(os.path.dirname(spec_file), '__init__.py', python_version, VERSION_REGEX)
ci/deploy/utils/setup_utils.py:PULP_SERVER_MANIFEST = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'puppet/pulp-server.pp')
ci/deploy/utils/setup_utils.py:PULP_CONSUMER_MANIFEST = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'puppet/pulp-consumer.pp')
ci/deploy/config/jenkins/el6-config.yml:cloud_config: cloud-init/cloud-config.txt
ci/deploy/config/jenkins/el7-config.yml:cloud_config: cloud-init/cloud-config.txt
ci/deploy/config/sample_config.yml:cloud_config: cloud-init/cloud-config.txt
ci/jobs/scripts/openstack-provision-machine.sh:cat > cloud-config.txt << EOF
ci/jobs/scripts/openstack-provision-machine.sh:    --user-data cloud-config.txt \
ci/deploy/README:deploy-environment.py script in this directory. This will provision the
ci/deploy/README:JSON file produced by deploy-environment.py to ssh into the pulp tester and
ci/deploy/README:script. This will also need the JSON file created by the deploy-environment.py
ci/deploy/cleanup-environment.py:description = 'Run integration tests using a deployed environment by deploy-environment.py'
ci/deploy/cleanup-environment.py:parser.add_argument('--config', help='path to the configuration file produced by deploy-environment.py', required=True)
ci/deploy/config/sample_config.yml:# 'deploy-environment.py' script. They will be overlayed in the order they are
ci/deploy/run-integration-tests.py:description = 'Run integration tests using a deployed environment by deploy-environment.py'
ci/deploy/run-integration-tests.py:parser.add_argument('--config', help='path to the configuration file produced by deploy-environment.py', required=True)
ci/deploy/README:the instances you created. This can be done with the cleanup-environment.py
ci/deploy/README:config/sample_os1_config.yml
ci/deploy/README:configuration file can be found at config/sample_config.yml. This can be
ci/deploy/README:integration tests using run-integration-tests.py. This will use the

PS.: the above command was run on a repository without the call to the pulp-unittest.pp on the prepare_node.sh scriopt.

@elyezer
Copy link
Collaborator Author

elyezer commented Jan 3, 2017

Added a second commit which is removing the ci/deploy directory. I've checked ci/jobs/build-automation.yaml and it is installing required packages for building the Pulp packages, line 55 of that file is:

sudo yum -y install rpm-build redhat-rpm-config koji mock rpmdevtools rpmlint tito createrepo

Copy link
Contributor

@seandst seandst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure that this won't break the pull request tester, but I don't think there's really a good way to be sure without merging this and rebuilding our images. SHIP IT.

@elyezer elyezer merged commit ab8a675 into pulp:master Jan 3, 2017
@elyezer elyezer deleted the drop-puppet branch January 3, 2017 19:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants