Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Remove replication plugin link from local environment setup Remove replication plugin code/variables from local environment setup Fix local environment setup: replication miss-configuration Change-Id: I0ebf33f7b4ba0216f0e44d9e8fa7eed6618b8c6c
diff --git a/setup_local_env/README.md b/setup_local_env/README.md index 88b40d5..e6ec9e7 100644 --- a/setup_local_env/README.md +++ b/setup_local_env/README.md
@@ -74,8 +74,6 @@ [--gerrit2-httpd-port] Gerrit Instance 2 http port; default 18081 [--gerrit2-sshd-port] Gerrit Instance 2 sshd port; default 49418 -[--replication-type] Options [file,ssh]; default file -[--replication-ssh-user] SSH user for the replication plugin; default $(whoami) [--replication-delay] Replication delay across the two instances in seconds [--just-cleanup-env] Cleans up previous deployment; default false
diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh index f51133b..4c91e9f 100755 --- a/setup_local_env/setup.sh +++ b/setup_local_env/setup.sh
@@ -35,18 +35,6 @@ fi } -function get_replication_url { - REPLICATION_LOCATION_TEST_SITE=$1 - REPLICATION_HOSTNAME=$2 - USER=$REPLICATION_SSH_USER - - if [ "$REPLICATION_TYPE" = "file" ];then - echo "url = file://$REPLICATION_LOCATION_TEST_SITE/git/#{name}#.git" - elif [ "$REPLICATION_TYPE" = "ssh" ];then - echo "url = ssh://$USER@$REPLICATION_HOSTNAME:$REPLICATION_LOCATION_TEST_SITE/git/#{name}#.git" - fi -} - function get_pull_replication_api_url { REPLICATION_HOSTNAME=$1 @@ -78,13 +66,11 @@ export LOCATION_TEST_SITE=$3 export GERRIT_SSHD_PORT=$4 export REPLICATION_HTTPD_PORT=$5 - export REPLICATION_LOCATION_TEST_SITE=$6 - export GERRIT_HOSTNAME=$7 - export REPLICATION_HOSTNAME=$8 - export REMOTE_DEBUG_PORT=$9 - export INSTANCE_ID=${10} - export REPLICA_INSTANCE_ID=${11} - export REPLICATION_URL=$(get_replication_url $REPLICATION_LOCATION_TEST_SITE $REPLICATION_HOSTNAME) + export GERRIT_HOSTNAME=$6 + export REPLICATION_HOSTNAME=$7 + export REMOTE_DEBUG_PORT=$8 + export INSTANCE_ID=${9} + export REPLICA_INSTANCE_ID=${10} export PULL_REPLICATION_URL=$(get_pull_replication_url $REPLICATION_HOSTNAME) export PULL_REPLICATION_API_URL=$(get_pull_replication_api_url $REPLICATION_HOSTNAME) @@ -151,11 +137,11 @@ GERRIT_SITE2_INSTANCE_ID="instance-2" # Set config SITE1 - copy_config_files $CONFIG_TEST_SITE_1 $GERRIT_SITE1_HTTPD_PORT $LOCATION_TEST_SITE_1 $GERRIT_SITE1_SSHD_PORT $GERRIT_SITE2_HTTPD_PORT $LOCATION_TEST_SITE_2 $GERRIT_SITE1_HOSTNAME $GERRIT_SITE2_HOSTNAME $GERRIT_SITE1_REMOTE_DEBUG_PORT $GERRIT_SITE1_INSTANCE_ID $GERRIT_SITE2_INSTANCE_ID + copy_config_files $CONFIG_TEST_SITE_1 $GERRIT_SITE1_HTTPD_PORT $LOCATION_TEST_SITE_1 $GERRIT_SITE1_SSHD_PORT $GERRIT_SITE2_HTTPD_PORT $GERRIT_SITE1_HOSTNAME $GERRIT_SITE2_HOSTNAME $GERRIT_SITE1_REMOTE_DEBUG_PORT $GERRIT_SITE1_INSTANCE_ID $GERRIT_SITE2_INSTANCE_ID # Set config SITE2 - copy_config_files $CONFIG_TEST_SITE_2 $GERRIT_SITE2_HTTPD_PORT $LOCATION_TEST_SITE_2 $GERRIT_SITE2_SSHD_PORT $GERRIT_SITE1_HTTPD_PORT $LOCATION_TEST_SITE_1 $GERRIT_SITE1_HOSTNAME $GERRIT_SITE2_HOSTNAME $GERRIT_SITE2_REMOTE_DEBUG_PORT $GERRIT_SITE2_INSTANCE_ID $GERRIT_SITE1_INSTANCE_ID + copy_config_files $CONFIG_TEST_SITE_2 $GERRIT_SITE2_HTTPD_PORT $LOCATION_TEST_SITE_2 $GERRIT_SITE2_SSHD_PORT $GERRIT_SITE1_HTTPD_PORT $GERRIT_SITE1_HOSTNAME $GERRIT_SITE2_HOSTNAME $GERRIT_SITE2_REMOTE_DEBUG_PORT $GERRIT_SITE2_INSTANCE_ID $GERRIT_SITE1_INSTANCE_ID } function is_docker_desktop { @@ -264,8 +250,6 @@ echo "[--gerrit2-httpd-port] Gerrit Instance 2 http port; default 18081" echo "[--gerrit2-sshd-port] Gerrit Instance 2 sshd port; default 49418" echo - echo "[--replication-type] Options [file,ssh]; default ssh" - echo "[--replication-ssh-user] SSH user for the replication plugin; default $(whoami)" echo "[--replication-delay] Replication delay across the two instances in seconds" echo echo "[--just-cleanup-env] Cleans up previous deployment; default false" @@ -338,16 +322,6 @@ shift shift ;; - "--replication-ssh-user" ) - export REPLICATION_SSH_USER=$2 - shift - shift - ;; - "--replication-type") - export REPLICATION_TYPE=$2 - shift - shift - ;; "--replication-delay") export REPLICATION_DELAY_SEC=$2 shift @@ -400,8 +374,6 @@ GERRIT_2_HTTPD_PORT=${GERRIT_2_HTTPD_PORT:-"18081"} GERRIT_1_SSHD_PORT=${GERRIT_1_SSHD_PORT:-"39418"} GERRIT_2_SSHD_PORT=${GERRIT_2_SSHD_PORT:-"49418"} -REPLICATION_TYPE=${REPLICATION_TYPE:-"file"} -REPLICATION_SSH_USER=${REPLICATION_SSH_USER:-$(whoami)} export REPLICATION_DELAY_SEC=${REPLICATION_DELAY_SEC:-"5"} export SSH_ADVERTISED_PORT=${SSH_ADVERTISED_PORT:-"29418"} HTTPS_ENABLED=${HTTPS_ENABLED:-"false"} @@ -509,11 +481,6 @@ { echo >&2 "Cannot download metrics-reporter-prometheus plugin: Check internet connection. Abort\ ing"; exit 1; } -if [ "$REPLICATION_TYPE" = "ssh" ];then - echo "Using 'SSH' replication type" - echo "Make sure ~/.ssh/authorized_keys and ~/.ssh/known_hosts are configured correctly" -fi - echo "Downloading pull-replication plugin $GERRIT_BRANCH" wget $GERRIT_CI/plugin-pull-replication-bazel-$GERRIT_BRANCH/$LAST_BUILD/pull-replication/pull-replication.jar \ -O $DEPLOYMENT_LOCATION/pull-replication.jar || { echo >&2 "Cannot download pull-replication plugin: Check internet connection. Abort\ @@ -577,10 +544,6 @@ echo "Replicating environment" cp -fR $LOCATION_TEST_SITE_1/* $LOCATION_TEST_SITE_2 - echo "Link replication plugin" - ln -s $LOCATION_TEST_SITE_1/plugins/replication.jar $LOCATION_TEST_SITE_1/lib/replication.jar - ln -s $LOCATION_TEST_SITE_2/plugins/replication.jar $LOCATION_TEST_SITE_2/lib/replication.jar - echo "Link pullreplication plugin" ln -s $LOCATION_TEST_SITE_1/plugins/pull-replication.jar $LOCATION_TEST_SITE_1/lib/pull-replication.jar ln -s $LOCATION_TEST_SITE_2/plugins/pull-replication.jar $LOCATION_TEST_SITE_2/lib/pull-replication.jar @@ -634,8 +597,6 @@ echo "===============================" echo "The admin password is 'secret'" echo "deployment-location=$DEPLOYMENT_LOCATION" -echo "replication-type=$REPLICATION_TYPE" -echo "replication-ssh-user=$REPLICATION_SSH_USER" echo "replication-delay=$REPLICATION_DELAY_SEC" echo "enable-https=$HTTPS_ENABLED" echo