Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions bin/installAll.sh
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ STARTUP_WAVES=(
"mc-infra-connector mc-infra-manager mc-iam-manager mc-iam-manager-post-initial"
"mc-data-manager mc-web-console-api mc-web-console-front"
"mc-observability-manager mc-observability-front mc-observability-insight mc-observability-insight-scheduler mc-observability-mcp-grafana mc-observability-mcp-maria mc-observability-mcp-influx mc-observability-log-collector"
"mc-workflow-manager-jenkins"
"mc-application-manager mc-workflow-manager mc-cost-optimizer-fe"
)

Expand Down Expand Up @@ -191,17 +190,6 @@ check_post_initial() {
fi
}

register_jenkins_credentials() {
local bootstrap_script="$PROJECT_ROOT_ABS/tool/jenkins/register-credentials.sh"

echo ""
echo "Registering Jenkins credentials..."
if ! bash "$bootstrap_script"; then
echo "Error: Jenkins credential registration failed." >&2
return 1
fi
}

# =============================================================================

# Save current directory at script start
Expand Down Expand Up @@ -556,19 +544,12 @@ case $RUN_MODE in
wave_num=$((wave_num + 1))
echo ""
echo "---- Wave $wave_num/${#STARTUP_WAVES[@]}: $wave_services ----"
if [ "$wave_num" -lt "${#STARTUP_WAVES[@]}" ]; then
./mcc infra run -d -s "$wave_services"
else
./mcc infra run -s "$wave_services"
fi
./mcc infra run -s "$wave_services"
run_exit=$?
if [ $run_exit -ne 0 ]; then
report_run_failure "$run_exit" "Wave $wave_num ($wave_services)"
exit 1
fi
if [ "$wave_services" = "mc-workflow-manager-jenkins" ]; then
register_jenkins_credentials || exit 1
fi
done

check_post_initial
Expand Down Expand Up @@ -605,9 +586,6 @@ case $RUN_MODE in
report_run_failure "$run_exit" "Wave $wave_num ($wave_services)"
exit 1
fi
if [ "$wave_services" = "mc-workflow-manager-jenkins" ]; then
register_jenkins_credentials || exit 1
fi
done

echo ""
Expand Down
1 change: 0 additions & 1 deletion conf/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,6 @@ services:
- /usr/bin/docker:/usr/bin/docker
- ./container-volume/mc-workflow-manager/jenkins/:/var/jenkins_home:rw
- ./tool/init.groovy.d:/usr/share/jenkins/ref/init.groovy.d
- ./tool/jenkins:/opt/mcmp/jenkins-credentials:ro
environment:
JENKINS_USERNAME: ${MC_WORKFLOW_MANAGER_JENKINS_USERNAME:-admin}
JENKINS_PASSWORD: ${MC_WORKFLOW_MANAGER_JENKINS_PASSWORD:-123456}
Expand Down
2 changes: 0 additions & 2 deletions conf/docker/tool/init.groovy.d/basic-security.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import hudson.security.*
// 설치할 플러그인 목록
def pluginParameter = """
workflow-api
credentials
snakeyaml-api
swarm
authorize-project
antisamy-markup-formatter
Expand Down
78 changes: 0 additions & 78 deletions conf/docker/tool/jenkins/jenkins-credentials.groovy

This file was deleted.

209 changes: 0 additions & 209 deletions conf/docker/tool/jenkins/register-credentials.sh

This file was deleted.