diff --git a/docs/integration/scm.md b/docs/integration/scm.md index 8cf5463b..12f6295c 100644 --- a/docs/integration/scm.md +++ b/docs/integration/scm.md @@ -8,50 +8,35 @@ ### Configure required credentials -After you register a repository a jenkins credential is generated with the format of `orgName-scmType-webhook-token`, this credential needs to be updated with a personal access token generated in your repository scm. +After you register a repository a jenkins credential is generated with the format of `orgName-scmType-webhook-token`, these credentials must be updated with the `new-token`. > Note: this jenkins credentials are globally used for each repository of an organization registered in zebrunner. -#### Github access token - - * Follow steps 1-9 [here](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token) to create your GitHub personal access token. - * Grant access for the following permissions: **repo and admin:repo_hook**. - -#### Gitlab access token - * Follow steps 1-7 [here](https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html#creating-a-personal-access-token) to create your Gitlab personal access token. - * In step **5** select the **api, read_repository, write_repository** scopes. - - -#### BitBucket Cloud token - * Open your terminal and run the following command ```echo -n username:password | base64``` where username and password are your BitBucket credentials, this will return a token encoded in base64. - -> Note: make sure to copy your token as your are going to need it in the **Configure Webhooks** and **Update Jenkins Credentials** sections. - #### Update Jenkins Credentials * Go to **Jenkins > Manage Jenkins > Manage credentials**. * Find your `orgName-scmType-webhook-token` credential and click on the ID. - * Update the **Secret text** with your correspondent scm token. + * Update the **Secret text** with your `new-token`. * Click save. ### Configure Webhooks #### GitHub: Configure Webhook for Pushes and Pull Requests * Go to your **GitHub repository page > Settings > Webhooks > Add webhook**. - * Add `http://your-zebrunner-domain.com/jenkins/generic-webhook-trigger/invoke?token=github-token-here` into "Payload URL" field. + * Add `http://your-zebrunner-domain.com/jenkins/generic-webhook-trigger/invoke?token=` into "Payload URL" field. * Select application/json in "Content Type" field. * Click **Let me select individual events** and select **Pushes, Pull Requests**. * Click **Add webhook**. #### Gitlab: Configure Webhook for Pushes and Pull Requests * Go to your **Gitlab repository page > Settings > Webhooks**. - * Add `http://your-zebrunner-domain.com/jenkins/generic-webhook-trigger/invoke?token=gitlab-token-here` into "Payload URL" field. + * Add `http://your-zebrunner-domain.com/jenkins/generic-webhook-trigger/invoke?token=` into "Payload URL" field. * "Secret Token" is empty field. * Select **Push and Merge Requests events**. * Click **Add webhook**. #### BitBucket Cloud: Configure Webhook for Pushes * Go to your **BitBucket repository page > Repository Settings > Webhooks > add webhook**. - * Enter `http://your-zebrunner-domain.com/jenkins/generic-webhook-trigger/invoke?token=bitbucket-token-here` into **URL** field. + * Enter `http://your-zebrunner-domain.com/jenkins/generic-webhook-trigger/invoke?token=` into **URL** field. * Check that **Repository push** is selected. * Click **Save**. diff --git a/jenkins b/jenkins index 5f9e65b9..37cc8efe 160000 --- a/jenkins +++ b/jenkins @@ -1 +1 @@ -Subproject commit 5f9e65b94ebf8520707b1d9350d946e7d49ed8ea +Subproject commit 37cc8efe72ac81a130dfc0dea4789a8fc3e6c863 diff --git a/mcloud b/mcloud index 0ce215a3..b95f59f1 160000 --- a/mcloud +++ b/mcloud @@ -1 +1 @@ -Subproject commit 0ce215a3ac48b5bd8bdc4706a89cd288379e314e +Subproject commit b95f59f167b122b89a6dda4f3369e4df64323f6e diff --git a/reporting b/reporting index 49731105..4c2d048f 160000 --- a/reporting +++ b/reporting @@ -1 +1 @@ -Subproject commit 49731105c50e76b2227b582d300fe0b036aa40b4 +Subproject commit 4c2d048f93fb1d696c92326f11b8e9078b1f166d diff --git a/selenoid b/selenoid index 44f5cb40..10d029a6 160000 --- a/selenoid +++ b/selenoid @@ -1 +1 @@ -Subproject commit 44f5cb40b265e5d14d952e939eb7e3255f018770 +Subproject commit 10d029a6f33fc9e235b1fd2df4ee4b4a4b9fb55b