02
Sat, Nov
2 New Articles

TechTip: Git to Bit(bucket)

Scripting
Typography
  • Smaller Small Medium Big Bigger
  • Default Helvetica Segoe Georgia Times

Use Git on IBM i and push it to a central repository on Bitbucket.

 

In the TechTip "Installing Git on IBM i," we learned how to obtain and install the open-source (and free) Git source-change management (SCM) tool. In this TechTip, we will take a step further by introducing how to maintain a Git project and push it up to a central repository on Bitbucket.org.

 

First things first. Head over to Bitbucket.org and sign up for a free account. Once you've logged into your new account, go ahead and create a new repository (as shown in Figure 1).

 

082815BartellFigure1 CreateRepoMenu

Figure 1: Create a repository from the Bitbucket menu.

 

Figure 2 shows the form fields for the new repository. The "Owner" can be either your individual account or a team account. Team accounts are great for giving other people access to a given repository, which can be either inside or outside your organization. Note I left this as a private repository as I don't want to share it with the world. Select the "Create repository" button and proceed to the next step.

 

082815BartellFigure2 CreateRepoForm

Figure 2: Create your repository on this form.

 

Figure 3 conveys that your repository was successfully created, and the "I'm starting from scratch" section is expanded. Here, we find subsequent details regarding the commands we need to run in a shell session on our IBM i to finish the configuration.

 

082815BartellFigure3 StartingFromScratch

Figure 3: The repository has been successfully created. Review further setup instructions.

 

Now open a shell (using ssh or CALL QP2TERM) and follow the instructions from Bitbucket. First, create a new directory using commands mkdir and cd (change directory). Then run the git init command to have this directory tracked by Git. This will create a .git directory within your ibmi_test directory that stores all future revisions. Lastly, run the git remote add command. This is declaring to the local Git project the name (origin) and location (This email address is being protected from spambots. You need JavaScript enabled to view it.:aaronbartell/ibmi_test.git). Note you could call it "dogbreath" if you wanted, but origin is a common name to use.

 

$ pwd

/home/AARON

$ mkdir ibmi_test

$ cd ibmi_test

$ git init

Initialized empty Git repository in /home/aaron/ibmi_test/.git/

$ git remote add origin This email address is being protected from spambots. You need JavaScript enabled to view it.:aaronbartell/ibmi_test.git

$ git remote -v

origin This email address is being protected from spambots. You need JavaScript enabled to view it.:aaronbartell/ibmi_test.git (fetch)

origin This email address is being protected from spambots. You need JavaScript enabled to view it.:aaronbartell/ibmi_test.git (push)

 

Now, we need to add a new file with content to our ibmi_test directory so Git has something to change manage. Below, the echo command will route the content in double quotes to file contributors.txt. Next, use the git add command to declare what files we want to add to the subsequent commit. This is useful when you might be working on multiple things and want them to be grouped separately. And finally use the git commit command to mark this group of changes in history. Git now has memory of what every single file in this directory looked like at this point in time. Note that no communication to Bitbucket has occurred at this point.

 

$ echo "Aaron Bartell" >> contributors.txt

$ git add contributors.txt

$ git commit -m 'Initial commit with contributors'

[master (root-commit) 09c1fe9] Initial commit with contributors

1 file changed, 1 insertion(+)

create mode 100644 contributors.txt

 

Before going further, we are going to set up SSH key-based authentication between the IBM i and your newly created Bitbucket account. SSH keys are a way to authenticate without the need for passwords. This can speed up software development without sacrificing security. To generate an SSH key, you need the no-charge licensed program 5733SC1 IBM Portable Utilities for i5/OS *BASE & Option 1. 5733SC1 includes the ssh-keygen command, which needs to be run from a shell session (as shown below). You can take the default for the file name (id_rsa) and choose whether you want to use a passphrase on that file.

 

$ ssh-keygen

Generating public/private rsa key pair.

Enter file in which to save the key (/home/AARON/.ssh/id_rsa): /home/aaron/.ssh/id_rsa

Enter passphrase (empty for no passphrase):

Enter same passphrase again:

Your identification has been saved in /home/aaron/.ssh/id_rsa.

Your public key has been saved in /home/aaron/.ssh/id_rsa.pub.

The key fingerprint is:

ac:99:a4:99:a6:99:6e:99:70:99:a2:99:99:99:fa:99 aaron@ibmi_name.COM

 

The .ssh directory will be created in your profile's /home directory if it didn't yet exist. Two files, id_rsa and id_rsa.pub, will also be created as shown below with the ls (list) command.

 

-bash-4.2$ ls -a /home/aaron/.ssh

id_rsa       id_rsa.pub

 

The id_rsa.pub file's contents are what we need to copy and paste into the newly created Bitbucket account. Use the cat command to display the contents to the screen. Or open the file with the editor of your choice. I masked the below with x's so I don't expose my key to the world.

 

$ cat /home/aaron/.ssh/id_rsa.pub

ssh-rsa

JuXZgxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxH8y/vc09XUXXx+Y

AAAABxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx7/GFrYolIvf

2GxdtxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxkItjoo3POIG2slEOLc

UAFOoAFiYdxxxxxxxxxxd/7uC4lYYVwxxNwk1Lc8W6qcOlSK/et9cDxxxxxxxx...

...xxxxxxiz//ffQkfbgI77HboKSAaLtxzu31rT/CIpFlgRU4bCQ== aaron@ibmi_name.COM

 

Now go to your Bitbucket account and click the profile icon and "Manage account" so we can add the SSH key generated in the previous step (as shown in Figure 4).

 

082815BartellFigure4 sshkeymenu

Figure 4: Manage your Bitbucket account.

 

Locate the "SSH keys" link in the lower left and select the "Add key" button (as shown in Figure 5).

 

082815BartellFigure5 sshkeyadd

Figure 5: Add a new SSH key button.

 

Paste the SSH key into the "Key" text area (as shown in Figure 6).

 

082815BartellFigure6 sshkeypasteibmivalue

Figure 6: Paste the SSH key from IBM i into Bitbucket.

 

Now your IBM i is ready to communicate with Bitbucket. Using the git push command, we can send our local commit(s) up to Bitbucket. Remember, origin is the location name we supplied earlier and master is the name of the primary and default branch in Git repositories. (I’ll cover more on branches in a future article).

 

$ git push -u origin master

Counting objects: 3, done.

Writing objects: 100% (3/3), 246 bytes | 0 bytes/s, done.

Total 3 (delta 0), reused 0 (delta 0)

To This email address is being protected from spambots. You need JavaScript enabled to view it.:aaronbartell/ibmi_test.git

* [new branch]     master -> master

Branch master set up to track remote branch master from origin.

 

Point your browser back at Bitbucket and click on the "Commits" icon on the far left to see your recent push (as shown in Figure 7).

 

082815BartellFigure7 bitbucketcommit

Figure 7: Bitbucket shows your commit listing.

Clicking on the commit link (09c1fe9 in this scenario) will show you everything that was changed in this commit (as shown in Figure 8). Not much to see in this case, but when more changes are made, then this view becomes priceless to learn what another developer has changed. Or, if you're like me and walk into a room only to forget why you're there, then this view is great for learning what you coded before lunch.

 

082815BartellFigure8 bitbucketgitdiff

Figure 8: Display the commit details.

 

Side note: Sometimes I will run git init on a directory just to gain short-term benefits of learning what's changed after a process has run. If I don't like the changes made, then I can easily revert the changes.

 

It's worth noting that you don't have to create a repository on Bitbucket (or other service) to store your source. You can keep it entirely on IBM i. Or you could create a local repository on IBM i and far into the future put it on Bitbucket. My point: there is plenty of flexibility. The Bitbucket repository doesn't need to be created before the IBM i one or vice versa.

 

That concludes this article. If you create a public repository that was created on your IBM I, then please ping @litmisteam on Twitter so we can tell the world. It doesn't need to be anything more than the simple example we just went through. We just want to celebrate with you! It's a community thing.

 

On a final note, this article was written while listening to, and being inspired by, this guy. "Listener" is a poet and has facial expressions that bring me much laughter. Who is in your player these days?

Aaron Bartell

Aaron Bartell is Director of IBM i Innovation for Krengel Technology, Inc. Aaron facilitates adoption of open-source technologies on IBM i through professional services, staff training, speaking engagements, and the authoring of best practices within industry publications andwww.litmis.comWith a strong background in RPG application development, Aaron covers topics that enable IBM i shops to embrace today's leading technologies, including Ruby on Rails, Node.js, Git for RPG source change management, and RSpec for unit testing RPG. Aaron is a passionate advocate of vibrant technology communities and the corresponding benefits available for today's modern application developers. Connect with Aaron via email atThis email address is being protected from spambots. You need JavaScript enabled to view it..

Aaron lives with his wife and five children in southern Minnesota. He enjoys the vast amounts of laughter that having a young family brings, along with camping and music. He believes there's no greater purpose than to give of our life and time to help others.

BLOG COMMENTS POWERED BY DISQUS

LATEST COMMENTS

Support MC Press Online

$

Book Reviews

Resource Center

  • SB Profound WC 5536 Have you been wondering about Node.js? Our free Node.js Webinar Series takes you from total beginner to creating a fully-functional IBM i Node.js business application. You can find Part 1 here. In Part 2 of our free Node.js Webinar Series, Brian May teaches you the different tooling options available for writing code, debugging, and using Git for version control. Brian will briefly discuss the different tools available, and demonstrate his preferred setup for Node development on IBM i or any platform. Attend this webinar to learn:

  • SB Profound WP 5539More than ever, there is a demand for IT to deliver innovation. Your IBM i has been an essential part of your business operations for years. However, your organization may struggle to maintain the current system and implement new projects. The thousands of customers we've worked with and surveyed state that expectations regarding the digital footprint and vision of the company are not aligned with the current IT environment.

  • SB HelpSystems ROBOT Generic IBM announced the E1080 servers using the latest Power10 processor in September 2021. The most powerful processor from IBM to date, Power10 is designed to handle the demands of doing business in today’s high-tech atmosphere, including running cloud applications, supporting big data, and managing AI workloads. But what does Power10 mean for your data center? In this recorded webinar, IBMers Dan Sundt and Dylan Boday join IBM Power Champion Tom Huntington for a discussion on why Power10 technology is the right strategic investment if you run IBM i, AIX, or Linux. In this action-packed hour, Tom will share trends from the IBM i and AIX user communities while Dan and Dylan dive into the tech specs for key hardware, including:

  • Magic MarkTRY the one package that solves all your document design and printing challenges on all your platforms. Produce bar code labels, electronic forms, ad hoc reports, and RFID tags – without programming! MarkMagic is the only document design and print solution that combines report writing, WYSIWYG label and forms design, and conditional printing in one integrated product. Make sure your data survives when catastrophe hits. Request your trial now!  Request Now.

  • SB HelpSystems ROBOT GenericForms of ransomware has been around for over 30 years, and with more and more organizations suffering attacks each year, it continues to endure. What has made ransomware such a durable threat and what is the best way to combat it? In order to prevent ransomware, organizations must first understand how it works.

  • SB HelpSystems ROBOT GenericIT security is a top priority for businesses around the world, but most IBM i pros don’t know where to begin—and most cybersecurity experts don’t know IBM i. In this session, Robin Tatam explores the business impact of lax IBM i security, the top vulnerabilities putting IBM i at risk, and the steps you can take to protect your organization. If you’re looking to avoid unexpected downtime or corrupted data, you don’t want to miss this session.

  • SB HelpSystems ROBOT GenericCan you trust all of your users all of the time? A typical end user receives 16 malicious emails each month, but only 17 percent of these phishing campaigns are reported to IT. Once an attack is underway, most organizations won’t discover the breach until six months later. A staggering amount of damage can occur in that time. Despite these risks, 93 percent of organizations are leaving their IBM i systems vulnerable to cybercrime. In this on-demand webinar, IBM i security experts Robin Tatam and Sandi Moore will reveal:

  • FORTRA Disaster protection is vital to every business. Yet, it often consists of patched together procedures that are prone to error. From automatic backups to data encryption to media management, Robot automates the routine (yet often complex) tasks of iSeries backup and recovery, saving you time and money and making the process safer and more reliable. Automate your backups with the Robot Backup and Recovery Solution. Key features include:

  • FORTRAManaging messages on your IBM i can be more than a full-time job if you have to do it manually. Messages need a response and resources must be monitored—often over multiple systems and across platforms. How can you be sure you won’t miss important system events? Automate your message center with the Robot Message Management Solution. Key features include:

  • FORTRAThe thought of printing, distributing, and storing iSeries reports manually may reduce you to tears. Paper and labor costs associated with report generation can spiral out of control. Mountains of paper threaten to swamp your files. Robot automates report bursting, distribution, bundling, and archiving, and offers secure, selective online report viewing. Manage your reports with the Robot Report Management Solution. Key features include:

  • FORTRAFor over 30 years, Robot has been a leader in systems management for IBM i. With batch job creation and scheduling at its core, the Robot Job Scheduling Solution reduces the opportunity for human error and helps you maintain service levels, automating even the biggest, most complex runbooks. Manage your job schedule with the Robot Job Scheduling Solution. Key features include:

  • LANSA Business users want new applications now. Market and regulatory pressures require faster application updates and delivery into production. Your IBM i developers may be approaching retirement, and you see no sure way to fill their positions with experienced developers. In addition, you may be caught between maintaining your existing applications and the uncertainty of moving to something new.

  • LANSAWhen it comes to creating your business applications, there are hundreds of coding platforms and programming languages to choose from. These options range from very complex traditional programming languages to Low-Code platforms where sometimes no traditional coding experience is needed. Download our whitepaper, The Power of Writing Code in a Low-Code Solution, and:

  • LANSASupply Chain is becoming increasingly complex and unpredictable. From raw materials for manufacturing to food supply chains, the journey from source to production to delivery to consumers is marred with inefficiencies, manual processes, shortages, recalls, counterfeits, and scandals. In this webinar, we discuss how:

  • The MC Resource Centers bring you the widest selection of white papers, trial software, and on-demand webcasts for you to choose from. >> Review the list of White Papers, Trial Software or On-Demand Webcast at the MC Press Resource Center. >> Add the items to yru Cart and complet he checkout process and submit

  • Profound Logic Have you been wondering about Node.js? Our free Node.js Webinar Series takes you from total beginner to creating a fully-functional IBM i Node.js business application.

  • SB Profound WC 5536Join us for this hour-long webcast that will explore:

  • Fortra IT managers hoping to find new IBM i talent are discovering that the pool of experienced RPG programmers and operators or administrators with intimate knowledge of the operating system and the applications that run on it is small. This begs the question: How will you manage the platform that supports such a big part of your business? This guide offers strategies and software suggestions to help you plan IT staffing and resources and smooth the transition after your AS/400 talent retires. Read on to learn: