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

Training prep #81

Merged
merged 72 commits into from Nov 20, 2017
Merged

Training prep #81

merged 72 commits into from Nov 20, 2017

Conversation

jburel
Copy link
Member

@jburel jburel commented Oct 21, 2017

In this PR

  • Update the README to match the new workflow
  • Update script to handle new parameter git_user
  • Introduce new steps
  • Remove infrastructure dependency
  • Fix build failure (setuptools)
  • Use Groovy Sandbox selected see https://wiki.jenkins.io/display/JENKINS/Script+Security+Plugin
  • No longer required to have the ome/script repo forked i.e. use --shallow for the merge command of OMERO-push

To test this PR:

@pwalczysko if you want to try again, before you start you will have to

  • organize the ssh keys and gitconfig files in a specific folder (no need to recreate key and token)
  • run in devspace directory rm -rf ansible/vendor/openmicroscopy.devspace to be sure that you get the latest version of the role
    The playbook to provision the devspace now only needs to be run once. I fixed the issue

@sbesson since we had to have a "specific" gitconfig file, I went a step further and remove the paramater github_user and require user in the gitconfig file. The value will be read from the file.
This means that user will only have to specify the path to the repo containing the ssh key and config files.

--depends-on ome/ansible-role-devspace#5

@jburel jburel changed the title Readme training Training prep Oct 23, 2017
@jburel jburel force-pushed the readme-training branch 2 times, most recently from 46e0b3c to 334763f Compare October 25, 2017 06:15
@pwalczysko
Copy link
Member



Create a file devspace_config/.ssh/config and add the following:

  Host github.com
      User git
      IdentityFile ~/.ssh/id_gh_rsa

This looks like a mistake to me. I do not have any IdentityFile under ~/.ssh/id_gh_rsa. Instead, I have this file under path/to/devspace_config/.ssh/id_gh_rsa

@pwalczysko
Copy link
Member

[github]
          token = your_token
          user = your_gh_username
  [user]
          email = your_email_address
          name = your_name

What is your_name here ? Is it my normal citizen name (first_name and surname ?) ?

@joshmoore
Copy link
Member

Real name, yes. It shows up in the commit messages as: "your_name <your_email_address>" a la:

$ git log -n 1 | grep Author
Author: jmoore <josh@glencoesoftware.com>

@pwalczysko
Copy link
Member



    Create an instance on OpenStack using the playbook create-devspace.yml. It is recommended to prefix the name of the devspace by your name or your initals:

      (dev) $ ansible-playbook create-devspace.yml -e vm_name=your_name-devspace-name -e vm_key_name=your_key

What is your_key here please ?

@joshmoore
Copy link
Member

What is your_key here please ?

The name of the key you created on or uploaded to openstack.

@jburel
Copy link
Member Author

jburel commented Nov 14, 2017

#81 (comment).
This is correct it will be used on devspace not locally

@pwalczysko
Copy link
Member

In the Access the devspace paragraph of the README https://github.com/jburel/devspace/tree/readme-training, I would have two suggestions:

  • is the url https://devspace_openstack_ip:$PORT actually a Command ? (it is highlighted as Command in the table in the abovementioned paragraph -> this is confusing
  • after I ran the docker-compose port $SERVICE $PRIVATE_PORT, I got a slightly non-trivial output like
docker-compose port nginx 80
WARNING: The JENKINS_PASSWORD variable is not set. Defaulting to a blank string.
WARNING: The USER_ID variable is not set. Defaulting to a blank string.
0.0.0.0:xxxxxx

where xxxxx is my port and I should substitute it for the $PORT variable which is in the url https://devspace_openstack_ip:$PORT -> maybe please explain this step, it would spare me trying https://devspace_openstack_ip:80

@pwalczysko
Copy link
Member

But my build is failing, see https://10.0.51.143:32769/job/BIOFORMATS-push/2/console.

@jburel jburel force-pushed the readme-training branch 3 times, most recently from eaba857 to 07ce444 Compare November 15, 2017 11:34
@jburel
Copy link
Member Author

jburel commented Nov 16, 2017

Failure was due to a misconfiguration in the config file
@pwalczysko has now his devspace up and running.
I will clarify in the readme that the files are not used locally to avoid confusion.

@jburel
Copy link
Member Author

jburel commented Nov 17, 2017

@pwalczysko I have updated the readme and troubleshooting and clarify the points we discussed
When you have a change, could you read through?
no need to redeploy a devspace

@jburel jburel added this to the 0.6.0 milestone Nov 17, 2017
- src: openmicroscopy.reboot-server
version: 0.1.0

- src: git+https://github.com/jburel/ansible-role-devspace.git
Copy link
Member

Choose a reason for hiding this comment

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

@jburel now everything has been tested by @pwalczysko and ome/ansible-role-devspace#5 has been integrated, can you push another commit to point at the master branch of the upstream repo for now

@joshmoore
Copy link
Member

joshmoore commented Nov 20, 2017

Bumped, @sbesson (build is re-running)

@sbesson sbesson merged commit 65ce6a3 into ome:master Nov 20, 2017
@jburel jburel deleted the readme-training branch December 13, 2017 18:33
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

4 participants