X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/340a9ffa3a84a8dc4d7b4413136c4f1719eb5591..7bd12f51c864ec78fc93f0fa95acf796a4999afc:/doc/user/tutorials/tutorial-submit-job.html.textile.liquid diff --git a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid index 3d58fad97f..eaafe96130 100644 --- a/doc/user/tutorials/tutorial-submit-job.html.textile.liquid +++ b/doc/user/tutorials/tutorial-submit-job.html.textile.liquid @@ -11,7 +11,9 @@ This tutorial demonstrates how to create a pipeline to run your crunch script on This tutorial uses @$USER@ to denote your username. Replace @$USER@ with your user name in all the following examples. -h2. Setting up Git +Also, this tutorial uses the @tutorial@ arvados repository created in "Add new arvados repository":add-new-repository.html as the example repository. + +h2. Clone arvados repository All Crunch scripts are managed through the Git revision control system. Before you start using Git, you should do some basic configuration (you only need to do this the first time): @@ -22,17 +24,17 @@ All Crunch scripts are managed through the Git revision control system. Before On the Arvados Workbench, click on the dropdown menu icon in the upper right corner of the top navigation menu to access the user settings menu, and click on the menu item *Manage account* to go to the account management page. -On the *Manage account* page, you will see *Repositories* panel. In this panel, you should see a repository with your user name listed in the *name* column. Next to *name* is the column *URL*. Copy the *URL* value associated with your repository. This should look like git@git.{{ site.arvados_api_host }}:$USER/$USER.git. +On the *Manage account* page, you will see *Repositories* panel. In this panel, you should see the @$USER/tutorial@ repository listed in the *name* column. Next to *name* is the column *URL*. Copy the *URL* value associated with your repository. This should look like git@git.{{ site.arvados_api_host }}:$USER/tutorial.git. Next, on the Arvados virtual machine, clone your Git repository:
~$ cd $HOME # (or wherever you want to install)
-~$ git clone git@git.{{ site.arvados_api_host }}:$USER/$USER.git
-Cloning into '$USER'...
+~$ git clone git@git.{{ site.arvados_api_host }}:$USER/tutorial.git +Cloning into 'tutorial'...
-This will create a Git repository in the directory called @$USER@ in your home directory. Say yes when prompted to continue with connection. +This will create a Git repository in the directory called @tutorial@ in your home directory. Say yes when prompted to continue with connection. Ignore any warning that you are cloning an empty repository. {% include 'notebox_begin' %} @@ -45,7 +47,7 @@ or *"search Google for Git tutorials":http://google.com/#q=git+tutorial*. h2. Creating a Crunch script -Start by entering the @$USER@ directory created by @git clone@. Next create a subdirectory called @crunch_scripts@ and change to that directory: +Start by entering the @tutorial@ directory created by @git clone@. Next create a subdirectory called @crunch_scripts@ and change to that directory:
~$ cd $USER
@@ -55,7 +57,7 @@ Start by entering the @$USER@ directory created by @git clone@.  Next create a s
 
 Next, using @nano@ or your favorite Unix text editor, create a new file called @hash.py@ in the @crunch_scripts@ directory.
 
-notextile. 
~/$USER/crunch_scripts$ nano hash.py
+notextile.
~/tutorial/crunch_scripts$ nano hash.py
Add the following code to compute the MD5 hash of each file in a collection (if you already completed "Writing a Crunch script":tutorial-firstscript.html you can just copy the @hash.py@ file you created previously.) @@ -63,16 +65,16 @@ Add the following code to compute the MD5 hash of each file in a collection (if Make the file executable: -notextile.
~/$USER/crunch_scripts$ chmod +x hash.py
+notextile.
~/tutorial/crunch_scripts$ chmod +x hash.py
Next, add the file to the staging area. This tells @git@ that the file should be included on the next commit. -notextile.
~/$USER/crunch_scripts$ git add hash.py
+notextile.
~/tutorial/crunch_scripts$ git add hash.py
Next, commit your changes. All staged changes are recorded into the local git repository: -
~/$USER/crunch_scripts$ git commit -m"my first script"
+
~/tutorial/crunch_scripts$ git commit -m"my first script"
 [master (root-commit) 27fd88b] my first script
  1 file changed, 45 insertions(+)
  create mode 100755 crunch_scripts/hash.py
@@ -81,12 +83,12 @@ Next, commit your changes. All staged changes are recorded into the local git r Finally, upload your changes to the Arvados server: -
~/$USER/crunch_scripts$ git push origin master
+
~/tutorial/crunch_scripts$ git push origin master
 Counting objects: 4, done.
 Compressing objects: 100% (2/2), done.
 Writing objects: 100% (4/4), 682 bytes, done.
 Total 4 (delta 0), reused 0 (delta 0)
-To git@git.qr1hi.arvadosapi.com:$USER/$USER.git
+To git@git.qr1hi.arvadosapi.com:$USER/tutorial.git
  * [new branch]      master -> master