Merge Dev to Main (Alpine 1.18 and Debian 12(Bookworm) update) #2

Merged
brammp merged 17 commits from dev into main 2023-11-18 16:20:35 +01:00
2 changed files with 3 additions and 4 deletions
Showing only changes of commit 1a7e098644 - Show all commits

View File

@@ -8,7 +8,7 @@ LXCBuilderIP=<ip.of.the.BuilderCT>
#StaticVars #StaticVars
AdminPassword=$(cat /var/lib/jenkins/secrets/initialAdminPassword) AdminPassword=$(cat /var/lib/jenkins/secrets/initialAdminPassword)
JeninsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup pipeline-stage-view custom-checkbox-parameter parameterized-scheduler" JenkinsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup pipeline-stage-view custom-checkbox-parameter parameterized-scheduler"
#Check if script is configured #Check if script is configured
if [ $ThisScriptConfigured = no ]; then if [ $ThisScriptConfigured = no ]; then
@@ -19,7 +19,7 @@ fi
#Download Jenkins-CLI tool #Download Jenkins-CLI tool
curl localhost:8080/jnlpJars/jenkins-cli.jar -o /opt/jenkins-cli.jar curl localhost:8080/jnlpJars/jenkins-cli.jar -o /opt/jenkins-cli.jar
#Install Plugins #Install Plugins
java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword install-plugin $JeninsPlugins java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword install-plugin $JenkinsPlugins
echo "jenkins.model.Jenkins.instance.securityRealm.createAccount(\"$JenkinsUsername\", \"$JenkinsPassword\")" | java -jar /opt/jenkins-cli.jar -s "http://localhost:8080" -webSocket -auth admin:$AdminPassword groovy = echo "jenkins.model.Jenkins.instance.securityRealm.createAccount(\"$JenkinsUsername\", \"$JenkinsPassword\")" | java -jar /opt/jenkins-cli.jar -s "http://localhost:8080" -webSocket -auth admin:$AdminPassword groovy =
#Installed plugin versions #Installed plugin versions
@@ -53,4 +53,4 @@ java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:
java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Debian-LXC java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Debian-LXC
java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Alpine-LXC java -jar /opt/jenkins-cli.jar -s http://localhost:8080/ -webSocket -auth admin:$AdminPassword build LXC-ImgBuilder/Alpine-LXC
echo "Debian-LXC and Alpine-LXC build will fail, this is expected behaviour" echo "Debian-LXC and Alpine-LXC build will fail, this is expected behaviour"
echo "Next step is to login to the jenins instance, update the credentials for the Node and delete the admin user" echo "Next step is to login to the Jenkins instance, update the credentials for the Node and delete the admin user"

View File

@@ -4,7 +4,6 @@ echo
#StaticVars #StaticVars
TempPassword=$(cat /opt/Setup/TempMysqlPasswd) TempPassword=$(cat /opt/Setup/TempMysqlPasswd)
JeninsPlugins="dark-theme ssh-slaves workflow-aggregator locale golang git dark-theme copyartifact ws-cleanup"
#Configure PhpMyAdmin #Configure PhpMyAdmin
mysql -u root --password="$TempPassword" < /opt/PhpMyAdmin/sql/create_tables.sql mysql -u root --password="$TempPassword" < /opt/PhpMyAdmin/sql/create_tables.sql