diff --git a/source/documentation/general-information/our-team.html.md.erb b/source/documentation/general-information/our-team.html.md.erb index dbd6a3c..cfc8560 100644 --- a/source/documentation/general-information/our-team.html.md.erb +++ b/source/documentation/general-information/our-team.html.md.erb @@ -1,21 +1,24 @@ --- owner_slack: "#nvvs-devops" title: Our Team -last_reviewed_on: 2023-06-20 +last_reviewed_on: 2023-10-11 review_in: 3 months --- # Our team - - - +| Name | Role | Email | +|------------------- |--------------------------- |---------------------------------- | +| Shreya Patel | Senior Product Manager | Shreya.Patel3@justice.gov.uk | +| Babatunde Kakaba | Senior Delivery Manager | Babatunde.Kaka@justice.gov.uk | +| Jenny Casanova | Associate Product Manager | jenny.casanova@justice.gov.uk | +| Thomas Wells | Associate Product Manager | Thomas.Wells2@justice.gov.uk | +| Dare Oluumil | Senior DevOps Engineer | Dare.Oluunmil@justice.gov.uk | +| Jahir Uddin | Senior DevOps Engineer | Jahir.Uddin@justice.gov.uk | +| Stephen James | Senior DevOps Engineer | Stephen.James4@justice.gov.uk | +| James Green | Senior DevOps Engineer | James.Green6@justice.gov.uk | +| Satish Gummadelli | Senior DevOps Engineer | Satish.Gummadelli@justice.gov.uk | -| | | | | -| --- | --- | --- | --- | +We're also on -
**Jahir Uddin**
Senior DevOps Engineer |
**Stephen James**
Senior DevOps Engineer | -
**Jenny Casanova**
Associate Product Manager |
**Thomas Wells**
Associate Product Manager | -
**Satish Gummadelli**
Senior DevOps Engineer |
**Dare Oluumil**
Senior DevOps Engineer | - - -We're also on [People Finder](https://peoplefinder.service.gov.uk/teams/nvvs-devops). +- [People Finder](https://peoplefinder.service.gov.uk/teams/lan-wifi). +- [Slack](https://mojdt.slack.com/archives/C01J2L0SC0P) diff --git a/source/documentation/team-guide/best-practices/signing-github-commits.html.md.erb b/source/documentation/team-guide/best-practices/signing-github-commits.html.md.erb index e17dae7..1e5f823 100644 --- a/source/documentation/team-guide/best-practices/signing-github-commits.html.md.erb +++ b/source/documentation/team-guide/best-practices/signing-github-commits.html.md.erb @@ -1,7 +1,7 @@ --- owner_slack: "#nvvs-devops" title: Signing GitHub Commits -last_reviewed_on: 2023-06-16 +last_reviewed_on: 2023-10-16 review_in: 3 months --- @@ -9,10 +9,10 @@ review_in: 3 months ## Generate a new GPG key -1. Download and install the GPG command line tools for your operating system. +1. Download and install the GPG command line tools for your operating system. `sudo apt-get install gnupg` -1. Generate a GPG key pair. +1. Generate a GPG key pair. `gpg --full-generate-key` 1. At the prompt, specify the kind of key you want, or press `Enter` to accept the default. @@ -25,22 +25,22 @@ review_in: 3 months 1. Enter your user ID information. -1. List the long form of the GPG keys for which you have both a public and private key. +1. List the long form of the GPG keys for which you have both a public and private key. `gpg --list-secret-keys --keyid-format=long` -1. From the list of GPG keys, copy the long form of the GPG key ID you'd like to use.
In this example, the GPG key ID is `3AA5C34371567BD2`: +1. From the list of GPG keys, copy the long form of the GPG key ID you'd like to use.
In this example, the GPG key ID is `3AA5C34371567BD2`: `sec rsa4096/3AA5C34371567BD2 2021-11-08 [SC]` -1. Paste the text below, substituting in the GPG key ID you'd like to use. In this example, the GPG key ID is `3AA5C34371567BD2`: +1. Paste the text below, substituting in the GPG key ID you'd like to use. In this example, the GPG key ID is `3AA5C34371567BD2`: `gpg --armor --export 3AA5C34371567BD2` 1. Copy your GPG key, beginning with `-----BEGIN PGP PUBLIC KEY BLOCK-----` and ending with `-----END PGP PUBLIC KEY BLOCK-----`. ## Add the GPG key to GitHub -1. In the upper-right corner of any page, click your profile photo, then click **Settings**. +1. In the upper-right corner of any page, click your profile photo, then click **Settings**. -1. In the user settings sidebar, click **SSH and GPG keys**. +1. In the user settings sidebar, click **SSH and GPG keys**. 1. Click **New GPG key**. @@ -48,38 +48,38 @@ review_in: 3 months 1. Click **Add GPG key**. -## Configure Git with the GPG key +## Configure Git with the GPG key -1. List the long form of the GPG keys for which you have both a public and private key. +1. List the long form of the GPG keys for which you have both a public and private key. `gpg --list-secret-keys --keyid-format=long` -1. From the list of GPG keys, copy the long form of the GPG key ID you'd like to use.
In this example, the GPG key ID is `3AA5C34371567BD2`: +1. From the list of GPG keys, copy the long form of the GPG key ID you'd like to use.
In this example, the GPG key ID is `3AA5C34371567BD2`: `sec rsa4096/3AA5C34371567BD2 2021-11-08 [SC]` -1. To set your GPG signing key in Git, paste the text below, substituting in the GPG key ID you'd like to use. In this example, the GPG key ID is `3AA5C34371567BD2`: +1. To set your GPG signing key in Git, paste the text below, substituting in the GPG key ID you'd like to use. In this example, the GPG key ID is `3AA5C34371567BD2`: `git config --global user.signingkey 3AA5C34371567BD2` -## Export GPG_TTY variable +## Export GPG_TTY variable -If you do not already have, add the below in your `.bashrc` or `.zshrc` file: +If you do not already have, add the below in your `.bashrc` or `.zshrc` file: -```` -# gpg -export GPG_TTY=$(tty) -```` +```` +# gpg +export GPG_TTY=$(tty) +```` ## Sign your commits >**Tips**: > ->To configure your Git client to sign commits by default for a local repository, ->run `git config commit.gpgsign true`. +>To configure your Git client to sign commits by default for a local repository, +>run `git config commit.gpgsign true`. > ->To sign all commits by default in any local repository on your computer, +>To sign all commits by default in any local repository on your computer, >run `git config --global commit.gpgsign true`. -1. When committing changes in your local branch, add the -S flag to the git commit command: -`git commit -S -m "your commit message"` +1. When committing changes in your local branch, add the -S flag to the git commit command: +`git commit -S -m "your commit message"` -1. When you've finished creating commits locally, push them to your remote repository on GitHub: -`git push` \ No newline at end of file +1. When you've finished creating commits locally, push them to your remote repository on GitHub: +`git push` diff --git a/source/documentation/team-guide/best-practices/tdd.html.md.erb b/source/documentation/team-guide/best-practices/tdd.html.md.erb index ab46a8e..244f9b4 100644 --- a/source/documentation/team-guide/best-practices/tdd.html.md.erb +++ b/source/documentation/team-guide/best-practices/tdd.html.md.erb @@ -1,7 +1,7 @@ --- owner_slack: "#nvvs-devops" title: Test Driven Development -last_reviewed_on: 2023-06-16 +last_reviewed_on: 2023-10-11 review_in: 3 months --- diff --git a/source/documentation/team-guide/joining-nvvs-devops-team.html.md.erb b/source/documentation/team-guide/joining-nvvs-devops-team.html.md.erb index c30798c..3876816 100644 --- a/source/documentation/team-guide/joining-nvvs-devops-team.html.md.erb +++ b/source/documentation/team-guide/joining-nvvs-devops-team.html.md.erb @@ -1,7 +1,7 @@ --- owner_slack: "#nvvs-devops" title: Joining the NVVS DevOps team -last_reviewed_on: 2023-06-20 +last_reviewed_on: 2023-10-11 review_in: 2 months --- @@ -39,13 +39,13 @@ We use Microsoft Teams and Google Meet for team calls, and use Slack for direct Our main chat platform is Slack, and this is our preferred method of communication. -Download Slack from the [Company Portal](companyportal:ApplicationId=5b3a3776-9335-4994-b940-edb324794764) on your MoJ issued laptop. +Download Slack from the [Company Portal](companyportal:ApplicationId=5b3a3776-9335-4994-b940-edb324794764) on your MoJ issued laptop. We have three main Slack channels listed below. -#### #nvvs-devops +#### #nvvs-devops-team-chat -The [#nvvs-devops](https://mojdt.slack.com/archives/C01J2L0SC0P) channel is our team channel where we have team discussions about anything ranging from: +The [#nvvs-devops-team-chat](https://mojdt.slack.com/archives/C04MN9N2ZKN) channel is our team channel where we have team discussions about anything ranging from: - in-depth technical issues - our plans for the day @@ -55,6 +55,11 @@ The [#nvvs-devops](https://mojdt.slack.com/archives/C01J2L0SC0P) channel is our If you can't make standup, post your standup update here. +#### #nvvs-devops + +The [#nvvs-devops](https://mojdt.slack.com/archives/C01J2L0SC0P) was previosly the our team channel, it's been replaced by the #nvvs-devops-team-chat. +It has very little communication posted these days. Likely will be closed in future. + #### #ask-nvvs-devops The [#ask-nvvs-devops](https://mojdt.slack.com/archives/C026AFE617T) channel is for anyone who isn't in the team to: @@ -70,7 +75,11 @@ It's a noisy channel, so it's up to you whether to join it. #### GitHub teams to join (optional) -To add or close issues in our GitHub Project, you need to join the [cloud-ops-admins](https://github.com/orgs/ministryofjustice/teams/cloud-ops-admins) team on GitHub. +To add or close issues in our GitHub Project, + +- Engineers: you need to join the [nvvs-devops-admins](https://github.com/orgs/ministryofjustice/teams/nvvs-devops-admins) team on GitHub. +- Management/Adminstration: you need to join the [nvvs-devops-writers](https://github.com/orgs/ministryofjustice/teams/nvvs-devops-writers) team on GitHub. + You can request to join or post a message in [#ask-nvvs-devops](https://mojdt.slack.com/archives/C026AFE617T) channel and someone in the team will help you. @@ -99,13 +108,13 @@ You can request to join or post a message in [#ask-nvvs-devops](https://mojdt.sl - [General Video and Messaging Guidance](https://security-guidance.service.justice.gov.uk/general-user-video-and-messaging-apps-guidance/) - [Government Classification Scheme](https://security-guidance.service.justice.gov.uk/government-classification-scheme/) -### For Engineers +### For Engineers - [Terraform: Up and Running](https://learning.oreilly.com/library/view/terraform-up-and/9781098116736/) ### For Everyone -- [The DevOps Handbook](https://learning.oreilly.com/library/view/the-devops-handbook/9781457191381/) +- [The DevOps Handbook](https://learning.oreilly.com/library/view/the-devops-handbook/9781457191381/) - [Accelerate](https://learning.oreilly.com/library/view/accelerate/9781457191435/) - [The Pheonix Project](https://learning.oreilly.com/library/view/the-phoenix-project/9781457191350/) - [Network Fundamentals](https://app.pluralsight.com/library/courses/computer-fundamentals-networking/table-of-contents)