Merge branch 'stable-3.1' into stable-3.2 * stable-3.1: Remove unmaintained attempt to Dockerize the whole multi-site setup Change-Id: I1204ae4d13911543de8e9a4a979a27b052a79b7c
diff --git a/dockerised_local_env/.gitignore b/dockerised_local_env/.gitignore deleted file mode 100644 index bc7d3f3..0000000 --- a/dockerised_local_env/.gitignore +++ /dev/null
@@ -1,30 +0,0 @@ -# LC_COLLATE=C sort - -/gerrit-1/bin/ -/gerrit-1/data/ -/gerrit-1/db/ -/gerrit-1/etc/ -/gerrit-1/git/ -/gerrit-1/index/ -/gerrit-1/lib/ -/gerrit-1/logs/ -/gerrit-1/plugins/ -/gerrit-1/ssh/known_hosts -/gerrit-1/tmp/ - -/gerrit-2/bin/ -/gerrit-2/data/ -/gerrit-2/db/ -/gerrit-2/etc/ -/gerrit-2/git/ -/gerrit-2/index/ -/gerrit-2/lib/ -/gerrit-2/logs/ -/gerrit-2/plugins/ -/gerrit-2/ssh/known_hosts -/gerrit-2/tmp/ - -/gerrit-common/shared-dir/ - -/syslog-sidecar/logs/ -/syslog-sidecar/socket/
diff --git a/dockerised_local_env/Makefile b/dockerised_local_env/Makefile deleted file mode 100644 index d48a672..0000000 --- a/dockerised_local_env/Makefile +++ /dev/null
@@ -1,75 +0,0 @@ -GERRIT_JOB=Gerrit-bazel-stable-2.16 -BUILD_NUM=377 -GERRIT_1_BIN_DIRECTORY=./gerrit-1/bin -GERRIT_2_BIN_DIRECTORY=./gerrit-2/bin -GERRIT_1_LIB_DIRECTORY=./gerrit-1/lib -GERRIT_2_LIB_DIRECTORY=./gerrit-2/lib -GERRIT_1_ETC_DIRECTORY=./gerrit-1/etc -GERRIT_2_ETC_DIRECTORY=./gerrit-2/etc -GERRIT_1_PLUGINS_DIRECTORY=./gerrit-1/plugins -GERRIT_2_PLUGINS_DIRECTORY=./gerrit-2/plugins -CORE_PLUGINS=replication -CI_URL=https://gerrit-ci.gerritforge.com/job -MYDIR=$(shell basename $(shell pwd)) -WGET=wget -N -q - -all: prepare download build - -prepare: - -mkdir -p $(GERRIT_1_PLUGINS_DIRECTORY) $(GERRIT_2_PLUGINS_DIRECTORY) $(GERRIT_1_BIN_DIRECTORY) $(GERRIT_2_BIN_DIRECTORY) $(GERRIT_1_ETC_DIRECTORY) $(GERRIT_2_ETC_DIRECTORY) $(GERRIT_1_LIB_DIRECTORY) $(GERRIT_2_LIB_DIRECTORY) - -download: gerrit plugin_websession_flatfile \ - plugin_healthcheck \ - plugin_delete_project \ - plugin_multi_site - - -gerrit: prepare - $(WGET) $(CI_URL)/$(GERRIT_JOB)/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war -P $(GERRIT_1_BIN_DIRECTORY) - cp $(GERRIT_1_BIN_DIRECTORY)/*.war $(GERRIT_2_BIN_DIRECTORY) - for plugin in $(CORE_PLUGINS); do $(WGET) $(CI_URL)/$(GERRIT_JOB)/lastSuccessfulBuild/artifact/gerrit/bazel-bin/plugins/$$plugin/$$plugin.jar -P $(GERRIT_1_PLUGINS_DIRECTORY); done - cp $(GERRIT_1_PLUGINS_DIRECTORY)/*.jar $(GERRIT_2_PLUGINS_DIRECTORY) - -plugin_websession_flatfile: prepare - $(WGET) $(CI_URL)/plugin-websession-flatfile-bazel-master-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/websession-flatfile/websession-flatfile.jar -P $(GERRIT_1_PLUGINS_DIRECTORY) - cp $(GERRIT_1_PLUGINS_DIRECTORY)/websession-flatfile.jar $(GERRIT_2_PLUGINS_DIRECTORY)/websession-flatfile.jar - -plugin_multi_site: prepare - $(WGET) $(CI_URL)/plugin-multi-site-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/multi-site/multi-site.jar -P $(GERRIT_1_LIB_DIRECTORY) - cp $(GERRIT_1_PLUGINS_DIRECTORY)/replication.jar $(GERRIT_1_LIB_DIRECTORY) - cp $(GERRIT_1_LIB_DIRECTORY)/*.jar $(GERRIT_2_LIB_DIRECTORY) - -plugin_healthcheck: prepare - $(WGET) $(CI_URL)/plugin-healthcheck-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/healthcheck/healthcheck.jar -P $(GERRIT_1_PLUGINS_DIRECTORY) - cp $(GERRIT_1_PLUGINS_DIRECTORY)/healthcheck.jar $(GERRIT_2_PLUGINS_DIRECTORY)/healthcheck.jar - -plugin_delete_project: prepare - $(WGET) $(CI_URL)/plugin-delete-project-bazel-stable-2.16/lastSuccessfulBuild/artifact/bazel-bin/plugins/delete-project/delete-project.jar -P $(GERRIT_1_PLUGINS_DIRECTORY) - cp $(GERRIT_1_PLUGINS_DIRECTORY)/delete-project.jar $(GERRIT_2_PLUGINS_DIRECTORY)/delete-project.jar - -build: - docker build -t $(MYDIR) ./gerrit-1 - docker build -t $(MYDIR) ./gerrit-2 - -clean_gerrit: prepare - -rm -fr gerrit-{1,2}/{db,data,cache,db,git,index,etc,bin,tmp,plugins,lib}/* - export GERRIT_REPLICATION_INSTANCE=gerrit-2; cat ./gerrit-common/replication.config.template | envsubst '$${GERRIT_REPLICATION_INSTANCE}' > ./gerrit-1/etc/replication.config - export GERRIT_REPLICATION_INSTANCE=gerrit-1; cat ./gerrit-common/replication.config.template | envsubst '$${GERRIT_REPLICATION_INSTANCE}' > ./gerrit-2/etc/replication.config - cp ./gerrit-common/*.config ./gerrit-1/etc - cp ./gerrit-common/*.config ./gerrit-2/etc - cp ./gerrit-common/git-daemon.sh ./gerrit-1/bin - cp ./gerrit-common/git-daemon.sh ./gerrit-2/bin - -init_gerrit: - docker-compose down && docker-compose build gerrit-1 && docker-compose build gerrit-2 && docker-compose up -d gerrit-1 && docker-compose up -d gerrit-2 - -init_all: clean_gerrit download - docker-compose down && docker-compose build && INIT=1 docker-compose up -d -restart_gerrit_1: - cp ./gerrit-common/*.db ./gerrit-1/db - -docker-compose kill gerrit-1 - sleep 3; INIT=0 docker-compose up -d gerrit-1 -restart_gerrit_2: - cp ./gerrit-common/*.db ./gerrit-2/db - -docker-compose kill gerrit-2 - sleep 3; INIT=0 docker-compose up -d gerrit-2
diff --git a/dockerised_local_env/README.md b/dockerised_local_env/README.md deleted file mode 100644 index 92be0cd..0000000 --- a/dockerised_local_env/README.md +++ /dev/null
@@ -1,64 +0,0 @@ -# Dockerised test environment - -## Prerequisites - -* envsubst: - -```bash -brew install gettext -brew link --force gettext -``` - -* wget: - -```bash -brew install wget -``` - -## Instructions - -The docker compose provided in this directory is meant to orchestrate the spin up -of a dockerised test environment with the latest stable Gerrit version. -Run it with: - -```bash -make init_all -``` - -The spin up will take a while, check what is going on with: - -```bash -docker-compose logs -f -``` - -*NOTE:* If you want to run any ssh command as admin you can use the ssh keys into the *gerrit-{1,2}/ssh* directory. - -If you need to restart one of the Gerrit instances to simulate, for example, -an upgrade, you can do it this way: - -```bash -make restart_gerrit_1 # (or make restart_gerrit_2) -``` - -## How to test - -Consider the -[instructions](https://gerrit-review.googlesource.com/Documentation/dev-e2e-tests.html) -on how to use Gerrit core's Gatling framework, to run non-core test scenarios -such as this plugin one below: - -```bash -sbt "gatling:testOnly com.googlesource.gerrit.plugins.multisite.scenarios.CloneUsingMultiGerrit1" -``` - -This is a scenario that can serve as an example for how to start testing a -multi-site Gerrit system, here such as this dockerized one. That scenario tries -to clone a project created on this dockerized multi Gerrit, from gerrit-1 (port -8081). The scenario therefore expects Gerrit multi-site to have properly -synchronized the new project from the up node gerrit-2 to gerrit-1. That -project gets deleted after by the (so aggregate) scenario. - -Scenario scala source files and their companion json resource ones are stored -under the usual src/test directories. That structure follows the scala package -one from the scenario classes. The core framework expects such a directory -structure for both the scala and resources (json data) files.
diff --git a/dockerised_local_env/docker-compose.yaml b/dockerised_local_env/docker-compose.yaml deleted file mode 100644 index b15684d..0000000 --- a/dockerised_local_env/docker-compose.yaml +++ /dev/null
@@ -1,111 +0,0 @@ -version: '3' -services: - gerrit-1: - build: ./gerrit-1 - networks: - gerrit-net: - environment: - INIT: ${INIT:-1} - volumes: - - ./gerrit-1/git:/var/gerrit/git - - ./gerrit-1/logs:/var/gerrit/logs - - ./gerrit-1/ssh:/var/gerrit/.ssh - - ./gerrit-1/index:/var/gerrit/index - - ./gerrit-1/data:/var/gerrit/data - - ./gerrit-1/etc:/var/gerrit/etc - - ./gerrit-1/db:/var/gerrit/db - - ./gerrit-1/plugins:/var/gerrit/plugins - - ./gerrit-1/lib:/var/gerrit/lib - - ./gerrit-1/tmp:/var/gerrit/tmp - - ./gerrit-common/shared-dir:/var/gerrit/shared-dir - ports: - - "39418:29418" - - "8081:8080" - depends_on: - - sshd - - zookeeper - - kafka-broker - container_name: gerrit-1 - gerrit-2: - build: ./gerrit-2 - networks: - gerrit-net: - environment: - INIT: ${INIT:-1} - volumes: - - ./gerrit-2/git:/var/gerrit/git - - ./gerrit-2/logs:/var/gerrit/logs - - ./gerrit-2/ssh:/var/gerrit/.ssh - - ./gerrit-2/index:/var/gerrit/index - - ./gerrit-2/data:/var/gerrit/data - - ./gerrit-2/etc:/var/gerrit/etc - - ./gerrit-2/db:/var/gerrit/db - - ./gerrit-2/plugins:/var/gerrit/plugins - - ./gerrit-2/lib:/var/gerrit/lib - - ./gerrit-2/tmp:/var/gerrit/tmp - - ./gerrit-common/shared-dir:/var/gerrit/shared-dir - ports: - - "49418:29418" - - "8082:8080" - depends_on: - - sshd - - zookeeper - - kafka-broker - container_name: gerrit-2 - sshd: - build: ./sshd - networks: - gerrit-net: - volumes: - - ./gerrit-2/git:/var/gerrit-2/git - - ./gerrit-2/ssh:/root/.ssh - - ./gerrit-1/git:/var/gerrit-1/git - container_name: sshd - zookeeper: - image: wurstmeister/zookeeper:latest - networks: - gerrit-net: - ports: - - "2181:2181" - kafka-broker: - image: wurstmeister/kafka:2.12-2.1.0 - networks: - gerrit-net: - ports: - - "9092:9092" - container_name: kafka-broker - environment: - KAFKA_ADVERTISED_HOST_NAME: kafka-broker - KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 - haproxy: - build: haproxy - ports: - - "8080:8080" - - "29418:29418" - networks: - gerrit-net: - depends_on: - - syslog-sidecar - - gerrit-1 - - gerrit-2 - environment: - - SYSLOG_SIDECAR=syslog-sidecar - - GERRIT_1=gerrit-1 - - GERRIT_1_SSH=29418 - - GERRIT_1_HTTP=8080 - - GERRIT_2=gerrit-2 - - GERRIT_2_SSH=29418 - - GERRIT_2_HTTP=8080 - - HAPROXY_HTTP_PORT=8080 - - HAPROXY_SSH_PORT=29418 - syslog-sidecar: - image: balabit/syslog-ng:3.19.1 - volumes: - - "./syslog-sidecar/logs:/var/log/syslog-ng" - - "./syslog-sidecar/socket:/var/run/syslog-ng" - - "./syslog-sidecar/config/:/etc/syslog-ng" - networks: - gerrit-net: -networks: - gerrit-net: - driver: bridge
diff --git a/dockerised_local_env/gerrit-1/Dockerfile b/dockerised_local_env/gerrit-1/Dockerfile deleted file mode 100644 index 0842933..0000000 --- a/dockerised_local_env/gerrit-1/Dockerfile +++ /dev/null
@@ -1,21 +0,0 @@ -FROM openjdk:8-jdk-alpine - -RUN adduser -D -h /var/gerrit gerrit && \ - apk update && apk upgrade && \ - apk add --no-cache bash git openssh netcat-openbsd curl ttf-dejavu && \ - apk add --no-cache git-daemon - -COPY --chown=gerrit:gerrit bin/release.war /var/gerrit/bin/gerrit.war -COPY --chown=gerrit:gerrit plugins /var/gerrit/plugins -COPY --chown=gerrit:gerrit etc /var/gerrit/etc - -ADD bin/git-daemon.sh /usr/local/bin/git-daemon.sh -RUN chmod +x /usr/local/bin/git-daemon.sh - -USER gerrit - -WORKDIR /var/gerrit - -COPY docker-entrypoint.sh /bin - -ENTRYPOINT /bin/docker-entrypoint.sh
diff --git a/dockerised_local_env/gerrit-1/docker-entrypoint.sh b/dockerised_local_env/gerrit-1/docker-entrypoint.sh deleted file mode 100755 index d0eb5f2..0000000 --- a/dockerised_local_env/gerrit-1/docker-entrypoint.sh +++ /dev/null
@@ -1,13 +0,0 @@ -#!/bin/bash -ex - -echo "Starting git daemon" -/usr/local/bin/git-daemon.sh & - -if [[ $INIT == 1 ]]; then - echo "Initializing Gerrit..." - java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit --batch --dev --install-all-plugins --no-auto-start - java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit --index accounts - java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit --index groups -fi - -java -jar /var/gerrit/bin/gerrit.war daemon
diff --git a/dockerised_local_env/gerrit-1/ssh/authorized_keys b/dockerised_local_env/gerrit-1/ssh/authorized_keys deleted file mode 100644 index 951a480..0000000 --- a/dockerised_local_env/gerrit-1/ssh/authorized_keys +++ /dev/null
@@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4e8vBvNFfv/tkKbS2HnnmVpy+AL0pDRQCLoXy6dqjA+67wjBy8Bexn+iH5YDfvNq89Q//6gJ5vV+uGvhzBWrELPQyuim9hBhKooGf5STzr8qrO5SWyhuiE+L3gBQdqoxgC/Bzb5hAAQinGqCdyQAPaPuEP1nse4MEQTzNRhUhsjHdHAVz4gY12NvXoPIP+1ObHDp5rz1HkwWFAyiQpxhctB6r9SyJRkaaesN8X8q4wEVnK0+zhGawenhfPAzPETiLmg2k5IaHhWG+zsExfrLOoKRvc4EPTHbmyRNlefSciU9c00lrivSfLu4x2864uKaLRMQIEZV9EqgPur+At5nTutodBWz/kvyf19D+RnsG7+jJQVOWbAbQtmjxNbYH6IvnMBgLqQf8MEbTvXdnOF0Q0iCfoyhHrD4IueOmcdUOBkXEpqHn05FUX7/+UY8ZUG64+o4cz0A0g3BypigmI/ksoNAQA/AiehXNmhjI67J8clAsY/s3TJUZE/f8JFg5tO7SVCba65Ja7vlyyBDn6VTSuOYJ2ofzByvdaUxqtV9y8AvE1K/NOWDwNoQ/HGQWTVCBcu1+CM0RsObMuoFzZ/t7MY29tmB5R/nGl99Z/PWTvxrpsQx+TcUEKem3eS4ToYqUn/+5/5Wa3oUP1F4POYgRJh8x0DBJSkEuS44XeMsXHw== your_email@example.com
diff --git a/dockerised_local_env/gerrit-1/ssh/config b/dockerised_local_env/gerrit-1/ssh/config deleted file mode 100644 index e76bebf..0000000 --- a/dockerised_local_env/gerrit-1/ssh/config +++ /dev/null
@@ -1,6 +0,0 @@ -Host * - User root - IdentityFile /var/gerrit/.ssh/id_rsa - PreferredAuthentications publickey - # Not ideal at all. Just a quick workaround to avoid updating the known_hosts at startup - StrictHostKeyChecking no
diff --git a/dockerised_local_env/gerrit-1/ssh/id_rsa b/dockerised_local_env/gerrit-1/ssh/id_rsa deleted file mode 100644 index 6535ddf..0000000 --- a/dockerised_local_env/gerrit-1/ssh/id_rsa +++ /dev/null
@@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY-----
diff --git a/dockerised_local_env/gerrit-1/ssh/id_rsa.pub b/dockerised_local_env/gerrit-1/ssh/id_rsa.pub deleted file mode 100644 index 951a480..0000000 --- a/dockerised_local_env/gerrit-1/ssh/id_rsa.pub +++ /dev/null
@@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4e8vBvNFfv/tkKbS2HnnmVpy+AL0pDRQCLoXy6dqjA+67wjBy8Bexn+iH5YDfvNq89Q//6gJ5vV+uGvhzBWrELPQyuim9hBhKooGf5STzr8qrO5SWyhuiE+L3gBQdqoxgC/Bzb5hAAQinGqCdyQAPaPuEP1nse4MEQTzNRhUhsjHdHAVz4gY12NvXoPIP+1ObHDp5rz1HkwWFAyiQpxhctB6r9SyJRkaaesN8X8q4wEVnK0+zhGawenhfPAzPETiLmg2k5IaHhWG+zsExfrLOoKRvc4EPTHbmyRNlefSciU9c00lrivSfLu4x2864uKaLRMQIEZV9EqgPur+At5nTutodBWz/kvyf19D+RnsG7+jJQVOWbAbQtmjxNbYH6IvnMBgLqQf8MEbTvXdnOF0Q0iCfoyhHrD4IueOmcdUOBkXEpqHn05FUX7/+UY8ZUG64+o4cz0A0g3BypigmI/ksoNAQA/AiehXNmhjI67J8clAsY/s3TJUZE/f8JFg5tO7SVCba65Ja7vlyyBDn6VTSuOYJ2ofzByvdaUxqtV9y8AvE1K/NOWDwNoQ/HGQWTVCBcu1+CM0RsObMuoFzZ/t7MY29tmB5R/nGl99Z/PWTvxrpsQx+TcUEKem3eS4ToYqUn/+5/5Wa3oUP1F4POYgRJh8x0DBJSkEuS44XeMsXHw== your_email@example.com
diff --git a/dockerised_local_env/gerrit-2/Dockerfile b/dockerised_local_env/gerrit-2/Dockerfile deleted file mode 100644 index d71b6c2..0000000 --- a/dockerised_local_env/gerrit-2/Dockerfile +++ /dev/null
@@ -1,21 +0,0 @@ -FROM openjdk:8-jdk-alpine - -RUN adduser -D -h /var/gerrit gerrit && \ - apk update && apk upgrade && \ - apk add --no-cache bash git openssh netcat-openbsd curl ttf-dejavu && \ - apk add --no-cache git-daemon - -COPY --chown=gerrit:gerrit bin/release.war /var/gerrit/bin/gerrit.war -COPY --chown=gerrit:gerrit plugins/* /var/gerrit/plugins/ -COPY --chown=gerrit:gerrit etc /var/gerrit/etc - -ADD bin/git-daemon.sh /usr/local/bin/git-daemon.sh -RUN chmod +x /usr/local/bin/git-daemon.sh - -USER gerrit - -WORKDIR /var/gerrit - -COPY docker-entrypoint.sh /bin - -ENTRYPOINT /bin/docker-entrypoint.sh
diff --git a/dockerised_local_env/gerrit-2/docker-entrypoint.sh b/dockerised_local_env/gerrit-2/docker-entrypoint.sh deleted file mode 100755 index 06f928f..0000000 --- a/dockerised_local_env/gerrit-2/docker-entrypoint.sh +++ /dev/null
@@ -1,23 +0,0 @@ -#!/bin/bash -ex - -echo "Starting git daemon" -/usr/local/bin/git-daemon.sh & - -if [[ $INIT == 1 ]]; then - java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit --batch --dev --no-auto-start --install-all-plugins - - echo "Remove git repos created during init phase" - rm -fr /var/gerrit/git/* - - echo "Waiting for gerrit1 server to become available." - sleep 120 - - chmod go-r /var/gerrit/.ssh/id_rsa - ssh-keyscan -t rsa -p 29418 gerrit-1 > /var/gerrit/.ssh/known_hosts - ssh -p 29418 admin@gerrit-1 replication start - - echo "Waiting for replication to complete." - sleep 30 -fi - -java -jar /var/gerrit/bin/gerrit.war daemon
diff --git a/dockerised_local_env/gerrit-2/ssh/authorized_keys b/dockerised_local_env/gerrit-2/ssh/authorized_keys deleted file mode 100644 index 951a480..0000000 --- a/dockerised_local_env/gerrit-2/ssh/authorized_keys +++ /dev/null
@@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4e8vBvNFfv/tkKbS2HnnmVpy+AL0pDRQCLoXy6dqjA+67wjBy8Bexn+iH5YDfvNq89Q//6gJ5vV+uGvhzBWrELPQyuim9hBhKooGf5STzr8qrO5SWyhuiE+L3gBQdqoxgC/Bzb5hAAQinGqCdyQAPaPuEP1nse4MEQTzNRhUhsjHdHAVz4gY12NvXoPIP+1ObHDp5rz1HkwWFAyiQpxhctB6r9SyJRkaaesN8X8q4wEVnK0+zhGawenhfPAzPETiLmg2k5IaHhWG+zsExfrLOoKRvc4EPTHbmyRNlefSciU9c00lrivSfLu4x2864uKaLRMQIEZV9EqgPur+At5nTutodBWz/kvyf19D+RnsG7+jJQVOWbAbQtmjxNbYH6IvnMBgLqQf8MEbTvXdnOF0Q0iCfoyhHrD4IueOmcdUOBkXEpqHn05FUX7/+UY8ZUG64+o4cz0A0g3BypigmI/ksoNAQA/AiehXNmhjI67J8clAsY/s3TJUZE/f8JFg5tO7SVCba65Ja7vlyyBDn6VTSuOYJ2ofzByvdaUxqtV9y8AvE1K/NOWDwNoQ/HGQWTVCBcu1+CM0RsObMuoFzZ/t7MY29tmB5R/nGl99Z/PWTvxrpsQx+TcUEKem3eS4ToYqUn/+5/5Wa3oUP1F4POYgRJh8x0DBJSkEuS44XeMsXHw== your_email@example.com
diff --git a/dockerised_local_env/gerrit-2/ssh/config b/dockerised_local_env/gerrit-2/ssh/config deleted file mode 100644 index e76bebf..0000000 --- a/dockerised_local_env/gerrit-2/ssh/config +++ /dev/null
@@ -1,6 +0,0 @@ -Host * - User root - IdentityFile /var/gerrit/.ssh/id_rsa - PreferredAuthentications publickey - # Not ideal at all. Just a quick workaround to avoid updating the known_hosts at startup - StrictHostKeyChecking no
diff --git a/dockerised_local_env/gerrit-2/ssh/id_rsa b/dockerised_local_env/gerrit-2/ssh/id_rsa deleted file mode 100644 index 6535ddf..0000000 --- a/dockerised_local_env/gerrit-2/ssh/id_rsa +++ /dev/null
@@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -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 ------END RSA PRIVATE KEY-----
diff --git a/dockerised_local_env/gerrit-2/ssh/id_rsa.pub b/dockerised_local_env/gerrit-2/ssh/id_rsa.pub deleted file mode 100644 index 951a480..0000000 --- a/dockerised_local_env/gerrit-2/ssh/id_rsa.pub +++ /dev/null
@@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC4e8vBvNFfv/tkKbS2HnnmVpy+AL0pDRQCLoXy6dqjA+67wjBy8Bexn+iH5YDfvNq89Q//6gJ5vV+uGvhzBWrELPQyuim9hBhKooGf5STzr8qrO5SWyhuiE+L3gBQdqoxgC/Bzb5hAAQinGqCdyQAPaPuEP1nse4MEQTzNRhUhsjHdHAVz4gY12NvXoPIP+1ObHDp5rz1HkwWFAyiQpxhctB6r9SyJRkaaesN8X8q4wEVnK0+zhGawenhfPAzPETiLmg2k5IaHhWG+zsExfrLOoKRvc4EPTHbmyRNlefSciU9c00lrivSfLu4x2864uKaLRMQIEZV9EqgPur+At5nTutodBWz/kvyf19D+RnsG7+jJQVOWbAbQtmjxNbYH6IvnMBgLqQf8MEbTvXdnOF0Q0iCfoyhHrD4IueOmcdUOBkXEpqHn05FUX7/+UY8ZUG64+o4cz0A0g3BypigmI/ksoNAQA/AiehXNmhjI67J8clAsY/s3TJUZE/f8JFg5tO7SVCba65Ja7vlyyBDn6VTSuOYJ2ofzByvdaUxqtV9y8AvE1K/NOWDwNoQ/HGQWTVCBcu1+CM0RsObMuoFzZ/t7MY29tmB5R/nGl99Z/PWTvxrpsQx+TcUEKem3eS4ToYqUn/+5/5Wa3oUP1F4POYgRJh8x0DBJSkEuS44XeMsXHw== your_email@example.com
diff --git a/dockerised_local_env/gerrit-common/ReviewDB.h2.db b/dockerised_local_env/gerrit-common/ReviewDB.h2.db deleted file mode 100644 index d23d444..0000000 --- a/dockerised_local_env/gerrit-common/ReviewDB.h2.db +++ /dev/null Binary files differ
diff --git a/dockerised_local_env/gerrit-common/ReviewDB.trace.db b/dockerised_local_env/gerrit-common/ReviewDB.trace.db deleted file mode 100644 index 52681d8..0000000 --- a/dockerised_local_env/gerrit-common/ReviewDB.trace.db +++ /dev/null
@@ -1,3 +0,0 @@ -11-23 08:24:02 jdbc[3]: exception -org.h2.jdbc.JdbcSQLException: Table "SCHEMA_VERSION" not found; SQL statement: -SELECT T.version_nbr,T.singleton FROM schema_version T WHERE T.singleton=? [42102-176]
diff --git a/dockerised_local_env/gerrit-common/gerrit.config b/dockerised_local_env/gerrit-common/gerrit.config deleted file mode 100644 index 0a47bea..0000000 --- a/dockerised_local_env/gerrit-common/gerrit.config +++ /dev/null
@@ -1,39 +0,0 @@ -[gerrit] - basePath = git - serverId = ff17821f-9571-42df-b690-30660f2d6e20 - canonicalWebUrl = http://localhost:8080/ - installModule = com.googlesource.gerrit.plugins.multisite.Module -[database] - type = h2 - database = db/ReviewDB -[noteDb "changes"] - autoMigrate = true - disableReviewDb = true - primaryStorage = note db - read = true - sequence = true - write = true -[container] - javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" - javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance" - javaHome = /usr/lib/jvm/java-1.8-openjdk/jre - user = gerrit -[index] - type = LUCENE -[auth] - type = DEVELOPMENT_BECOME_ANY_ACCOUNT -[receive] - enableSignedPush = false -[sendemail] - smtpServer = localhost -[sshd] - listenAddress = *:29418 - advertisedAddress = *:29418 -[httpd] - listenUrl = proxy-http://*:8080/ -[cache] - directory = cache -[plugins] - allowRemoteAdmin = true -[plugin "websession-flatfile"] - directory = /var/gerrit/shared-dir
diff --git a/dockerised_local_env/gerrit-common/git-daemon.sh b/dockerised_local_env/gerrit-common/git-daemon.sh deleted file mode 100644 index a54c8e0..0000000 --- a/dockerised_local_env/gerrit-common/git-daemon.sh +++ /dev/null
@@ -1,3 +0,0 @@ -#!/bin/sh - -git daemon --verbose --enable=receive-pack --base-path=/var/gerrit/git --export-all
diff --git a/dockerised_local_env/gerrit-common/healthcheck.config b/dockerised_local_env/gerrit-common/healthcheck.config deleted file mode 100644 index 849e23f..0000000 --- a/dockerised_local_env/gerrit-common/healthcheck.config +++ /dev/null
@@ -1,9 +0,0 @@ -[healthcheck] - timeout = 10s - -[healthcheck "querychanges"] - # No changes available when Gerrit is installed from scratch - enabled = false - -[healthcheck "auth"] - username = "admin" \ No newline at end of file
diff --git a/dockerised_local_env/gerrit-common/multi-site.config b/dockerised_local_env/gerrit-common/multi-site.config deleted file mode 100644 index deec00f..0000000 --- a/dockerised_local_env/gerrit-common/multi-site.config +++ /dev/null
@@ -1,21 +0,0 @@ -[index] - maxTries = 6 - retryInterval = 30000 - numStripedLocks = 100 - -[kafka] - bootstrapServers = kafka-broker:9092 - securityProtocol = PLAINTEXT - indexEventTopic = gerrit_index - streamEventTopic = gerrit_stream - projectListEventTopic = gerrit_list_project - cacheEventTopic = gerrit_cache_eviction - -[kafka "subscriber"] - pollingIntervalMs = 1000 - KafkaProp-enableAutoCommit = true - KafkaProp-autoCommitIntervalMs = 1000 - KafkaProp-autoOffsetReset = latest - -[ref-database "zookeeper"] - connectString = "zookeeper:2181"
diff --git a/dockerised_local_env/gerrit-common/replication.config.template b/dockerised_local_env/gerrit-common/replication.config.template deleted file mode 100644 index 3864e92..0000000 --- a/dockerised_local_env/gerrit-common/replication.config.template +++ /dev/null
@@ -1,17 +0,0 @@ -[remote "Replication"] - url = git://${GERRIT_REPLICATION_INSTANCE}:9418/${name}.git - adminUrl = ssh://root@sshd:22/var/${GERRIT_REPLICATION_INSTANCE}/git/${name}.git - push = +refs/*:refs/* - timeout = 600 - rescheduleDelay = 15 - replicationDelay = 5 - mirror = true - createMissingRepositories = true - replicateProjectDeletions = true - replicateHiddenProjects = true -[gerrit] - autoReload = true - replicateOnStartup = false -[replication] - lockErrorMaxRetries = 5 - maxRetries = 5
diff --git a/dockerised_local_env/haproxy/Dockerfile b/dockerised_local_env/haproxy/Dockerfile deleted file mode 100644 index dd3f9cd..0000000 --- a/dockerised_local_env/haproxy/Dockerfile +++ /dev/null
@@ -1,13 +0,0 @@ -FROM haproxy:1.9.4 - -RUN apt-get update && \ - apt-get -y install gettext-base netcat && \ - rm -rf /var/lib/apt/lists/* && \ - mkdir /var/lib/haproxy && \ - mkdir /var/run/haproxy && \ - useradd haproxy && \ - chown haproxy: /var/lib/haproxy /var/run/haproxy - -COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg.template - -COPY docker-entrypoint.sh /
diff --git a/dockerised_local_env/haproxy/docker-entrypoint.sh b/dockerised_local_env/haproxy/docker-entrypoint.sh deleted file mode 100755 index b78a994..0000000 --- a/dockerised_local_env/haproxy/docker-entrypoint.sh +++ /dev/null
@@ -1,3 +0,0 @@ -#!/bin/sh -envsubst < /usr/local/etc/haproxy/haproxy.cfg.template > /usr/local/etc/haproxy/haproxy.cfg -haproxy -f /usr/local/etc/haproxy/haproxy.cfg
diff --git a/dockerised_local_env/haproxy/haproxy.cfg b/dockerised_local_env/haproxy/haproxy.cfg deleted file mode 100644 index 000ed9e..0000000 --- a/dockerised_local_env/haproxy/haproxy.cfg +++ /dev/null
@@ -1,63 +0,0 @@ -global - log $SYSLOG_SIDECAR local0 - maxconn 2048 - -defaults - log global - mode http - option httplog - option dontlognull - timeout connect 5000 - timeout client 900000 - timeout server 900000 - timeout check 30000 - -frontend haproxynode - bind *:$HAPROXY_HTTP_PORT - mode http - acl redirect_reads url_reg -i git-upload-pack - acl redirect_reads url_reg -i clone.bundle - acl redirect_writes url_reg -i git-receive-pack - use_backend read-backendnodes if redirect_reads - use_backend write-backendnodes if redirect_writes - default_backend read-backendnodes - -frontend git_ssh - bind *:$HAPROXY_SSH_PORT - option tcplog - mode tcp - timeout client 5m - default_backend ssh - -backend read-backendnodes - mode http - balance source - option forwardfor - http-request set-header X-Forwarded-Port %[dst_port] - default-server inter 10s fall 3 rise 2 - option httpchk GET /config/server/healthcheck~status HTTP/1.0 - http-check expect status 200 - server node1 $GERRIT_1:$GERRIT_1_HTTP check inter 10s - server node2 $GERRIT_2:$GERRIT_2_HTTP check inter 10s - -backend write-backendnodes - mode http - balance roundrobin - option forwardfor - http-request set-header X-Forwarded-Port %[dst_port] - default-server inter 10s fall 3 rise 2 - option httpchk GET /config/server/healthcheck~status HTTP/1.0 - http-check expect status 200 - server node1 $GERRIT_1:$GERRIT_1_HTTP check inter 10s - server node2 $GERRIT_2:$GERRIT_2_HTTP check inter 10s backup - -backend ssh - mode tcp - option redispatch - option httpchk GET /config/server/healthcheck~status HTTP/1.0 - http-check expect status 200 - balance source - timeout connect 10s - timeout server 5m - server ssh_node1 $GERRIT_1:$GERRIT_1_SSH check inter 10s check port $GERRIT_1_HTTP inter 10s - server ssh_node2 $GERRIT_2:$GERRIT_2_SSH check inter 10s check port $GERRIT_2_HTTP inter 10s backup
diff --git a/dockerised_local_env/sshd/Dockerfile b/dockerised_local_env/sshd/Dockerfile deleted file mode 100644 index d1065cd..0000000 --- a/dockerised_local_env/sshd/Dockerfile +++ /dev/null
@@ -1,6 +0,0 @@ -FROM sickp/alpine-sshd:6.8 - -RUN apk update && apk upgrade && \ - apk add --no-cache bash git netcat-openbsd curl - -COPY sshd_config /etc/ssh/sshd_config
diff --git a/dockerised_local_env/sshd/sshd_config b/dockerised_local_env/sshd/sshd_config deleted file mode 100644 index c40561f..0000000 --- a/dockerised_local_env/sshd/sshd_config +++ /dev/null
@@ -1,16 +0,0 @@ -Port 22 -HostKey /etc/ssh/ssh_host_rsa_key -HostKey /etc/ssh/ssh_host_ecdsa_key -HostKey /etc/ssh/ssh_host_ed25519_key -SyslogFacility AUTHPRIV -LogLevel INFO -PermitRootLogin yes -AuthorizedKeysFile /root/.ssh/authorized_keys -PasswordAuthentication no -ChallengeResponseAuthentication no -UsePAM yes -AcceptEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES -AcceptEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT -AcceptEnv LC_IDENTIFICATION LC_ALL LANGUAGE -AcceptEnv XMODIFIERS -Subsystem sftp /usr/libexec/openssh/sftp-server
diff --git a/dockerised_local_env/syslog-sidecar/config/syslog-ng.conf b/dockerised_local_env/syslog-sidecar/config/syslog-ng.conf deleted file mode 100644 index bbd27b6..0000000 --- a/dockerised_local_env/syslog-sidecar/config/syslog-ng.conf +++ /dev/null
@@ -1,31 +0,0 @@ -@version: 3.11 - -options { - keep_hostname(yes); - create_dirs(yes); - ts_format(iso); - time_reopen (10); - chain_hostnames (no); -}; - -source s_net { - tcp( - ip("0.0.0.0") - ); - udp( - ip("0.0.0.0") - ); - syslog( - ip("0.0.0.0") - ); - unix-stream("/var/run/lock/syslog-ng.sock"); -}; - -destination logfiles { - file("/var/log/syslog-ng/$PROGRAM.log"); -}; - -log { - source(s_net); - destination(logfiles); -};