Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add marker file via Dockerfile. Script will remove marker and exit if… #198

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Add marker file via Dockerfile. Script will remove marker and exit if… #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecd4ccb
Add marker file via Dockerfile. Script will remove marker and exit if…
kerogers-cloudbees Oct 19, 2021
ce62f18
Changes from PR. Move marker file out of init.groovy.d. Add and use n…
kerogers-cloudbees Oct 19, 2021
f1d086d
Use chown during copy to set ownership.
kerogers-cloudbees Oct 19, 2021
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
10 changes: 10 additions & 0 deletions uc-certificate-fix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM cloudbees/cloudbees-core-mm:2.303.2.6

USER jenkins

RUN mkdir -p /var/jenkins_home/init.groovy.d
COPY --chown=jenkins:jenkins ./ucCertRemediation.groovy /var/jenkins_home/init.groovy.d/

RUN touch /var/jenkins_home/DO_NOT_RUN_UC_REMEDIATION && \
chown jenkins /var/jenkins_home/DO_NOT_RUN_UC_REMEDIATION && \
chmod 755 /var/jenkins_home/DO_NOT_RUN_UC_REMEDIATION
31 changes: 30 additions & 1 deletion uc-certificate-fix/ucCertRemediation.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
* - 2.277.42.0.3 or newer on the 2.277.x fixed release, or
* - 2.249.33.0.2 on the 2.249.x fixed release
*
* - OCI Container notes
* If this script is installed into a container via Dockerfile, the container will need to be run once and restarted
* for this script to take effect.
*
* How to use this script
* - This script can be run using the script console on any individual operations center or controller. It may also be run via
* a cluster-operation (https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/cluster-operations)
Expand Down Expand Up @@ -59,9 +63,22 @@
* DISABLED_CERT_VALIDATION
* REMOVED_OFFLINE_UC
* UNINSTALLED_SCRIPT
* SKIPPING_FIRST_RUN
* ERROR_CONTACT_SUPPORT: [msg]
*/

import hudson.model.UpdateCenter;
import hudson.model.UpdateSite;
import hudson.util.PersistedList;
import jenkins.model.Jenkins;
import com.cloudbees.jenkins.plugins.license.nectar.CloudBeesUpdateSite;
import net.sf.json.JSONObject;
import net.sf.json.JSONException;
import hudson.util.FormValidation;
import java.security.cert.CertificateExpiredException;
import hudson.model.DownloadService;


def _script = '''
import hudson.model.UpdateCenter;
import hudson.model.UpdateSite;
Expand All @@ -87,14 +104,24 @@ _dry_run = false;

//Constants - do not edit below this line
// ----------------------------------------------------------------------------------------------------
_version = "00005";
_version = "00007";
_online_uc_url_prefix = "https://jenkins-updates.cloudbees.com/update-center/";
_offline_uc_url = "file:" + Jenkins.getInstance().getRootDir() + File.separator + "war" + File.separator + "WEB-INF" + File.separator + "plugins" + File.separator + "update-center.json";
_offline_uc_url_modern = "file:" + Jenkins.getInstance().servletContext.getRealPath("/") + File.separator + "WEB-INF" + File.separator + "plugins" + File.separator + "update-center.json";
_retry_time = 30000; // how long to wait before checking for an update site to be loaded
_cert_error_str = "CertificateExpiredException: NotAfter: Tue Oct 19 14:31:36 EDT 2021";

// MAIN CODE BODY
info("Checking for first run inside an OCI container");
// The Dockerfile will need to create this file. It will prevent this script from running.
noRunFilePath = "/var/jenkins_home/DO_NOT_RUN_UC_REMEDIATION";
def noRunFile = new File (noRunFilePath)
if (noRunFile.exists()) {
info("Found marker file for first run. Removing file and exiting")
noRunFile.delete()
return "SKIPPING_FIRST_RUN"
}

info("Executing remediation check [v" + _version + "]");
if (System.properties['_CLOUDBEES_UC_CERT_REMEDIATION_INSTALL'] == "TRUE") {
info("Running bootstrap install, disabling retry interval");
Expand Down Expand Up @@ -403,6 +430,8 @@ if (result.equals("NO_CHANGE_NEEDED")) {
println("The remediation is now complete and successful");
} else if (result.equals("UNINSTALLED_SCRIPT")) {
println("No issues detected, script has been uninstalled");
} else if (result.equals("SKIPPING_FIRST_RUN")) {
println("Running in container and skipping first run. Restart container to run script.");
} else {
// some other error occured
println("An error occured: " + result);
Expand Down