Replacing Gerrit with GitLab #298

lykabernardo · 2018-11-07T09:05:21Z

No description provided.

Added LDAP-LTB, LDAP-PHPADMIN and updated version of ADOP-NGINX to 0.2.0

Clean up of both docker-machine existing test and create command itself.

Updating Jenkins image version number to 0.1.4

README.md improvements

Added check to make sure INITIAL_ADMIN_USER is not set to 'admin'

Feature: Added --without-pull option to init function.

Adding ADOP_PLATFORM_MANAGEMENT_VERSION to Jenkins

Adding a mechanism to provide Jenkins with AWS parameters in override file

Adding minor bug fixes

Adding missing double quotes

Bug fix by removing unneccesary double quotes in quickstart

… as the function name

Issue: Accenture#174 - add page for adop cli and quickstart

issue Accenture#174 fixing index bug and code block issue

davidjeddy · 2018-11-21T14:37:44Z

Looks reasonable, Travis not being able to build the project indicates a configuration error though. Could we get that corrected please.

As a side note; I am personally not a fan of force-pushes. It re-writes the branch history on the repo. This makes it impossible for anyone else to contribute during the dev. cycle.

Increase travis timeout

…t-with-gitlab

davidjeddy

Excellent update to ADOP.

.travis.yml

davidjeddy · 2018-12-10T15:21:02Z

cmd/project

@@ -49,7 +49,7 @@ load_help() {
    printf "    %-3s   %s\n" "" "-r <ENABLE_CODE_REVIEW>  : This is to control whether to enable code review or not for the repositories loaded by cartridge. (Optional) (Default: false)"
    printf "    %-3s   %s\n" "" "-h                   : Print this help."
    echo
-    echo "HINT: Run '${CMD_NAME} ${SUB_CMD_NAME} -p <PROJECT_NAME> -w <WORKSPACE_NAME> load -u ssh://jenkins@gerrit:29418/cartridges/adop-cartridge-java.git' to load java reference catridge in adop jenkins instance under existing workspace/project."
+    echo "HINT: Run '${CMD_NAME} ${SUB_CMD_NAME} -p <PROJECT_NAME> -w <WORKSPACE_NAME> load -u https://github.com/Accenture/adop-cartridge-java.git' to load java reference catridge in adop jenkins instance under existing workspace/project."


Any way we can continue to use SSH w/ GitHub?

davidjeddy · 2018-12-10T15:36:21Z

site/_docs/developing/cartridges.md

@@ -31,13 +31,13 @@ High-level guidelines for writing Jenkins jobs in Job DSL:
    * Ensure that you are using the preBuildCleanup() wrapper in your Job DSL to make sure that your Jenkins workspace is cleared before every build.
    * Do not make any credentials visible anywhere in your job i.e. do not echo passwords in your shell script or store credentials as plain-text build parameters. Ensure you are always using the maskPasswords() and injectPasswords() wrappers in your Job DSL.
        * Credentials can also be added manually to the Jenkins credential store and then referenced in your job.
-    * It is highly recommended that the sshAgent() wrapper be used with the Jenkins credentials specified in order to allow Jenkins to clone all local git repositories from Gerrit over SSH.
+    * It is highly recommended that the sshAgent() wrapper be used with the Jenkins credentials specified in order to allow Jenkins to clone all local git repositories from Gitlab over SSH.


Above in cmd/project HTTPS is used to clone.

davidjeddy · 2018-12-10T15:41:49Z

site/_docs/operating/cartridges.md

@@ -18,6 +18,6 @@ Once you [generate a project](/adop-docker-compose/docs/operating/projects), you
 	- `CARTRIDGE_FOLDER` - The folder name within the project namespace where your cartridge will be loaded into.
 	- `FOLDER_DISPLAY_NAME` - Display name of the folder where the cartridge is loaded.
 	- `FOLDER_DESCRIPTION` - Description of the folder where the cartridge is loaded.
-	- `ENABLE_CODE_REVIEW` - Enables Gerrit Code Reviewing for the selected cartridge.
+	- `ENABLE_CODE_REVIEW` - Enables Code Reviewing for the selected cartridge (only supports Gerrit).


Gitlab is being added as the code review option, no?

This feature can be implemented in Gitlab as well I think, however currently this is implemented only for Gerrit, this is about "thumbs up" feature when on success build Jenkins sends signal to Gerrit API and increasing "score" of changeset in Gerrit.

Random example from the internet :)

pipeline { agent any stages { stage('Example') { steps { echo 'Hello World' } } } post { success { gerritReview score:1 } failure { gerritReview score:-1 } } }

Ah, ok. That helps clarify it.

davidjeddy · 2018-12-10T15:42:35Z

site/_docs/reference/cli/project.md

Same comment as above regarding ssh vs https.

davidjeddy · 2018-12-11T16:48:46Z

I am still concerned the build is failing.

RobertNorthard

This is awesome great work - Added a few additional comments.

Do we want the ADOP CLI to support Gerrit and Gitlab? @anton-kasperovich / @dsingh07

RobertNorthard · 2018-12-12T22:57:42Z

env.config.sh

-# Gerrit MySQL
+# Gitlab Postgresql
+export GITLAB_POSTGRES_USER="gitlab"
+export GITLAB_POSTGRES_PASSWORD="gitlab"


Please can we generate the postgres password? I'm not to keen on static credentials.

Updated PR to include generation or postgres password.

RobertNorthard · 2018-12-12T23:13:48Z

docker-compose.yml

+     gitlab_rails['db_database'] = "${GITLAB_POSTGRES_DB}"
+     gitlab_rails['db_adapter'] = 'postgresql'
+     gitlab_rails['db_encoding'] = 'utf8'
+     gitlab_rails['monitoring_whitelist'] = ['127.0.0.0/8', '172.0.0.0/8']


The docker network (local_network) is created with 172.19.0.0/16 address space, but this does not stop CUSTOM_NETWORK_NAME been overridden and a user using a pre-defined one.

I feel we have 3 options here:

Whitelist the whole private IP address space and loopbacks

Pass the docker network subnet CIDR in as a parameter

Whitelist all and rely on the proxy / Docker SDN

As discussed with @marisbahtins, updated PR with the second option: Pass the docker network subnet CIDR in as a parameter

…net CIDR for monitoring_whitelist

nickdgriffin and others added 30 commits April 20, 2016 17:14

Merge pull request Accenture#52 from iniweb/ldap_management

36173ef

Added LDAP-LTB, LDAP-PHPADMIN and updated version of ADOP-NGINX to 0.2.0

Merge pull request Accenture#32 from robwells57/master

a35c90d

Clean up of both docker-machine existing test and create command itself.

Fixing typos

9711a89

Updating Jenkins image version number to 0.1.4

ddc55f9

Merge pull request Accenture#54 from dsingh07/master

14274d3

Updating Jenkins image version number to 0.1.4

Improving readme and adding an image

230232c

startup.sh deprecation: removing from readme

f4f81ee

Merge pull request Accenture#58 from nickdgriffin/master

c55c367

README.md improvements

Feature: Added --without-pull option to init function.

e297c13

Added check to make sure INITIAL_ADMIN_USER is not set to 'admin'

e6b0081

Merge pull request Accenture#63 from SachinKSingh28/master

19b2fff

Added check to make sure INITIAL_ADMIN_USER is not set to 'admin'

Adding ADOP_PLATFORM_MANAGEMENT_VERSION to Jenkins

d148521

Merge pull request Accenture#60 from neb0t/DA-1872

2c8d338

Feature: Added --without-pull option to init function.

Merge pull request Accenture#61 from nickdgriffin/master

a49e89b

Adding ADOP_PLATFORM_MANAGEMENT_VERSION to Jenkins

Adding sourceable file for cloud provider-specific parameters

e9e77cf

Updating Jenkins image version to 0.1.5

130d4dd

Merge pull request Accenture#59 from dsingh07/master

2c98dae

Adding a mechanism to provide Jenkins with AWS parameters in override file

Adding minor bug fixes

b3a2fc3

Merge pull request Accenture#65 from dsingh07/master

5575371

Adding minor bug fixes

Adding missing double quotes

d841363

Merge pull request Accenture#67 from nickdgriffin/master

e7cc8ee

Adding missing double quotes

Removing local-setup.sh and startup.sh to force quickstart.sh usage

e28badf

Removing generate_client_certs.sh

108bd7a

Bug fix by removing unneccesary double quotes in quickstart

22d558b

Merge pull request Accenture#69 from dsingh07/master

bbc3d3f

Bug fix by removing unneccesary double quotes in quickstart

Fixed an issue with the name of the gen-certs function

1ee830d

Bug fix for gen-certs

6cc8e25

Preserve gen-certs as the subcommand while using gen_certs internally…

8b42619

… as the function name

Creating site directory content for GitHub Pages

7a17c86

Adding development instructions and Travis CI build

3cd4d1d

dsingh07 and others added 3 commits October 15, 2018 11:32

Merge pull request Accenture#175 from luismsousa/master

cd8381b

Issue: Accenture#174 - add page for adop cli and quickstart

issue Accenture#174 fixing index bug and code block issue

9e672b8

Merge pull request Accenture#292 from luismsousa/master

5266a61

issue Accenture#174 fixing index bug and code block issue

lykabernardo force-pushed the feature/replace-gerrit-with-gitlab branch 5 times, most recently from 834d9eb to 1d35bf2 Compare November 14, 2018 13:57

lykabernardo force-pushed the feature/replace-gerrit-with-gitlab branch 2 times, most recently from 8fdcf9d to 9b927f9 Compare November 16, 2018 08:39

Replacing Gerrit with GitLab

11c95ad

lykabernardo force-pushed the feature/replace-gerrit-with-gitlab branch from 9b927f9 to 11c95ad Compare November 20, 2018 04:51

Updating ADOP_PLATFORM_MANAGEMENT_VERSION

410cbad

dsingh07 requested a review from SachinKSingh28 November 22, 2018 12:46

marisbahtins and others added 4 commits December 7, 2018 14:40

Increase travis timeout

bc6176e

Merge pull request Accenture#302 from marisbahtins/master

963a9e4

Increase travis timeout

Merge remote-tracking branch 'adop/master' into feature/replace-gerri…

542f222

…t-with-gitlab

increate travis wait to 40 min

0f2143c

davidjeddy suggested changes Dec 10, 2018

View reviewed changes

davidjeddy previously approved these changes Dec 11, 2018

View reviewed changes

RobertNorthard suggested changes Dec 12, 2018

View reviewed changes

marisbahtins dismissed davidjeddy’s stale review via 0f2143c December 19, 2018 08:21

marisbahtins force-pushed the feature/replace-gerrit-with-gitlab branch from e49686a to 0f2143c Compare December 19, 2018 08:21

Adding generation of PostgreSQL password and using docker network sub…

bcaad01

…net CIDR for monitoring_whitelist

lykabernardo force-pushed the feature/replace-gerrit-with-gitlab branch from db8d84e to bcaad01 Compare December 19, 2018 11:53

dsingh07 mentioned this pull request Mar 25, 2019

Enhancement: Replace Travis with native Github Actions for CI #309

Open

RobertNorthard closed this Aug 11, 2020

RobertNorthard force-pushed the master branch from e5506fd to 4c741c6 Compare August 11, 2020 18:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replacing Gerrit with GitLab #298

Replacing Gerrit with GitLab #298

lykabernardo commented Nov 7, 2018

davidjeddy commented Nov 21, 2018

davidjeddy left a comment

davidjeddy Dec 10, 2018

davidjeddy Dec 10, 2018

davidjeddy Dec 10, 2018

anton-kasperovich Dec 12, 2018

davidjeddy Dec 12, 2018

davidjeddy Dec 10, 2018 •

edited

Loading

davidjeddy commented Dec 11, 2018

RobertNorthard left a comment

RobertNorthard Dec 12, 2018

lykabernardo Dec 19, 2018

RobertNorthard Dec 12, 2018

lykabernardo Dec 19, 2018

Replacing Gerrit with GitLab #298

Replacing Gerrit with GitLab #298

Conversation

lykabernardo commented Nov 7, 2018

davidjeddy commented Nov 21, 2018

davidjeddy left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

davidjeddy Dec 10, 2018 • edited Loading

Choose a reason for hiding this comment

davidjeddy commented Dec 11, 2018

RobertNorthard left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

davidjeddy Dec 10, 2018 •

edited

Loading