Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-42746

Windows Slaves Plugin should use internal jenkins-slave.xml

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      Currently the code implements the macro engine on its own, but then it takes the config file from the core, which may actually change at any moment. A Longer-term fix is JENKINS-42743, but now it makes sense to have a hotfix like a local copy of the file.

        Attachments

          Issue Links

            Activity

            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Oleg Nenashev
            Path:
            src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
            src/main/resources/hudson/os/windows/configsamples/jenkins-slave.xml
            src/test/java/hudson/os/windows/ManagedWindowsServiceLauncherTest.java
            http://jenkins-ci.org/commit/windows-slaves-plugin/0872fc38409a7efe05f239650e944aef4e174456
            Log:
            JENKINS-42746 - Make the plugin independent from the XML sample in the core

            In Jenkins 2.50 we have got JENKINS-42724, which has been caused by the usage of the old resource file located within the Jenkins core.
            It is likely a leftover from the migration of the windows-slaves-installer module.

            Since the Windows Slaves plugin has its internal macro resolution logic, the sample should be also inside plugin. A longer-term fix is to make the plugin depent on the Windows Agent Installer module

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Oleg Nenashev Path: src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java src/main/resources/hudson/os/windows/configsamples/jenkins-slave.xml src/test/java/hudson/os/windows/ManagedWindowsServiceLauncherTest.java http://jenkins-ci.org/commit/windows-slaves-plugin/0872fc38409a7efe05f239650e944aef4e174456 Log: JENKINS-42746 - Make the plugin independent from the XML sample in the core In Jenkins 2.50 we have got JENKINS-42724 , which has been caused by the usage of the old resource file located within the Jenkins core. It is likely a leftover from the migration of the windows-slaves-installer module. Since the Windows Slaves plugin has its internal macro resolution logic, the sample should be also inside plugin. A longer-term fix is to make the plugin depent on the Windows Agent Installer module
            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Oleg Nenashev
            Path:
            src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
            http://jenkins-ci.org/commit/windows-slaves-plugin/63fc71dd1207cda5a6d3884fa304f9bee82de2be
            Log:
            JENKINS-42746 - Amend the TODO comment for JENKINS-42743

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Oleg Nenashev Path: src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java http://jenkins-ci.org/commit/windows-slaves-plugin/63fc71dd1207cda5a6d3884fa304f9bee82de2be Log: JENKINS-42746 - Amend the TODO comment for JENKINS-42743
            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Oleg Nenashev
            Path:
            src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java
            src/main/resources/hudson/os/windows/configsamples/jenkins-slave.xml
            src/test/java/hudson/os/windows/ManagedWindowsServiceLauncherTest.java
            http://jenkins-ci.org/commit/windows-slaves-plugin/1500a86961153470bd03e2689dd75fc081dfec2c
            Log:
            Merge pull request #6 from oleg-nenashev/bug/JENKINS-42746

            JENKINS-42746 - Make the plugin independent from the XML sample in the core

            Compare: https://github.com/jenkinsci/windows-slaves-plugin/compare/5a2040a959b1...1500a8696115

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Oleg Nenashev Path: src/main/java/hudson/os/windows/ManagedWindowsServiceLauncher.java src/main/resources/hudson/os/windows/configsamples/jenkins-slave.xml src/test/java/hudson/os/windows/ManagedWindowsServiceLauncherTest.java http://jenkins-ci.org/commit/windows-slaves-plugin/1500a86961153470bd03e2689dd75fc081dfec2c Log: Merge pull request #6 from oleg-nenashev/bug/ JENKINS-42746 JENKINS-42746 - Make the plugin independent from the XML sample in the core Compare: https://github.com/jenkinsci/windows-slaves-plugin/compare/5a2040a959b1...1500a8696115
            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Oleg Nenashev
            Path:
            pom.xml
            http://jenkins-ci.org/commit/windows-slaves-plugin/f2e24b428e75a7d3fd3c2f6184fa7b0e9ff8ad79
            Log:
            Merge branch 'bug/JENKINS-42746'

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Oleg Nenashev Path: pom.xml http://jenkins-ci.org/commit/windows-slaves-plugin/f2e24b428e75a7d3fd3c2f6184fa7b0e9ff8ad79 Log: Merge branch 'bug/ JENKINS-42746 '
            Hide
            oleg_nenashev Oleg Nenashev added a comment -

            Fixed in 1.3

            Show
            oleg_nenashev Oleg Nenashev added a comment - Fixed in 1.3

              People

              • Assignee:
                oleg_nenashev Oleg Nenashev
                Reporter:
                oleg_nenashev Oleg Nenashev
              • Votes:
                0 Vote for this issue
                Watchers:
                3 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: