Created
January 30, 2015 13:01
-
-
Save madAndroid/d02bea021dc6d553ac81 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/.ssh/id_rsa b/.ssh/id_rsa | |
| deleted file mode 100644 | |
| index 90d89a1..0000000 | |
| --- a/.ssh/id_rsa | |
| +++ /dev/null | |
| @@ -1,27 +0,0 @@ | |
| ------BEGIN RSA PRIVATE KEY----- | |
| -MIIEpAIBAAKCAQEA1m6NpH2vwzUjKmCMRMg/lDig8l14tLSDuWqyJNbV1J/EZloT | |
| -bPBP+k5+y36ttQZNnoMw7HrHhY9YY5Vv7W0E9Pld/a6KAzz3aXcMsFS1gsdHL1QO | |
| -weNj73tuZ7PmUYVgbP4Z40acZWczkkNNpgx/daLTx3L+5rVkvzDV2qyVCHKFOu+5 | |
| -X0x+T0lHZoLto3Ag3sllIYZE/ztvRIRplCraBqXeRN138Ea1KG2gRvTQosfVClBF | |
| -h7MG0cQMFLwptPW8S3DR7xzz44Nc1LLf+itFfYuH6QxunJSWzZjMDntMwTclH2fE | |
| -h63a17PLqH1Ybj/uP8QNS7F9Q0YGmH0mvXCRQwIDAQABAoIBAHK4VsMoEv6G0Td8 | |
| -y86Iq6sq2MCRzWAwK0DpmkEnRuMoTrTLgBUKRF+P2zoXnet5YdFqMqRx04ja9djh | |
| -PC5z4vEE8Iol9ORim6Mq8/jqeOlsn+LsP7DvbKnVCW4lyxTWHI5zK3pybn25xtd7 | |
| -dnFdwls3L8JG/aSEa0/2WpNRPbJ0Rxur45u0fKvrnfpJ4SqQXw6f3J9HZWHVdgX3 | |
| -pxGkv7cwRQsfIGLyJyhI/AoWSALy62n9H8sSaSPqcFZ16YisWDasS8pSuuM+O66r | |
| -7p2K/kCJOxzYSWNhBGtXFTZA+spUuctIr6e/ISBtdcHuCWT2TaEI7pNmneR/p4Wc | |
| -CUVE2KECgYEA+o/Q4Ny/Jsn9BLNhZUOQpkkEfmcYn3yz4GBdFs+KnrTRtUKHrlbX | |
| -jvMcW0ZOlsEQ27FNM/V23BAhXMOAPlJ5xRbBhtJVHqib10xm8bFe7p4q/sV1HyxG | |
| -owy9CuG1187OirBEotPx1Yi7slQQPEx2XBcxS0MhHRdLiEiqWC8AEfsCgYEA2xX9 | |
| -is/brsEYBwToPFXBtOpiljcXaai1nbtTqgY8uA5v+CcltFKbbIRgHj04EAV4T6hb | |
| -8TmNIzCXA/Kxv6yudJAFW72JuAKhyXUkAyBShmwi5nbf6cqtfAmrz1Rqj91eoPJl | |
| -vgkU3y8dyYQPzbVKoBRnIL6BRFwvcVIei27PI1kCgYEA9mINB9CJtt7QiprJnwX9 | |
| -a0ZJwPIn6Ex7pJudbhzPNpifzhmJygljFhJBRA+yn9NhfGawf/NT2bmS1OD5bk8z | |
| -pnZl/uk9AlTSSbe7UtcTfpjRtoz8SpcDLroL+nNQmNGnkAEcvPCk0VEPIKBBBso5 | |
| -aPz1YAi2uyB5CZ5Kw0QUUZkCgYAAghSMdd70kM4VdhVzzl8cpE6GOqp7PEDvlLek | |
| -9U6+vonT8YNM38QshEIUz9+JafnVdXaBILkLE9nF0JJI94WQD6VziQUAwEDPzs2+ | |
| -lByc4zNRhYUPbcDpQLx9RpzYqJLHnMhPoIXD3sAa74t51qnNpT53/Pkfx3b0tFQN | |
| -zrv8QQKBgQCQZfflrK14+ZqF7hPKaWPJMvmy8M1zbkFQkvT1x6+RxzLSSoQIOufK | |
| -PL3zwbgQuv1geGAKMZm+0TTN40N0Z2J1wWF20+kQ2h0lIBrKwu8m+elAuQaJwc6O | |
| -N6ox2iOtD4RCa0AD4SW1Yr6oGfDzNSFQ1XNcUSUlRJLObr9lUZ9Zhw== | |
| ------END RSA PRIVATE KEY----- | |
| diff --git a/config.xml b/config.xml | |
| index b7decd3..77581ac 100644 | |
| --- a/config.xml | |
| +++ b/config.xml | |
| @@ -15,11 +15,10 @@ | |
| <groupSearchBase>ou=groups</groupSearchBase> | |
| <disableMailAddressResolver>false</disableMailAddressResolver> | |
| </securityRealm> | |
| - <disableRememberMe>false</disableRememberMe> | |
| <projectNamingStrategy class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/> | |
| <workspaceDir>${ITEM_ROOTDIR}/workspace</workspaceDir> | |
| <buildsDir>${ITEM_ROOTDIR}/builds</buildsDir> | |
| - <markupFormatter class="hudson.markup.RawHtmlMarkupFormatter" plugin="antisamy-markup-formatter@1.1"> | |
| + <markupFormatter class="hudson.markup.RawHtmlMarkupFormatter"> | |
| <disableSyntaxHighlighting>false</disableSyntaxHighlighting> | |
| </markupFormatter> | |
| <jdks/> | |
| @@ -133,7 +132,6 @@ | |
| <jobNames> | |
| <comparator class="hudson.util.CaseInsensitiveComparator"/> | |
| <string>I1-PRE_Deploy_M3</string> | |
| - <string>I1-PRE_Deploy_Meddra</string> | |
| <string>I1-PRE_Deploy_Puppet</string> | |
| </jobNames> | |
| <jobFilters> | |
| @@ -168,7 +166,6 @@ | |
| <jobNames> | |
| <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView[2]/jobNames/comparator"/> | |
| <string>I1-PROD_Deploy_M3</string> | |
| - <string>I1-PROD_Deploy_Meddra</string> | |
| <string>I1-PROD_Deploy_Puppet</string> | |
| </jobNames> | |
| <jobFilters> | |
| @@ -202,9 +199,7 @@ | |
| <properties class="hudson.model.View$PropertyList"/> | |
| <jobNames> | |
| <comparator class="hudson.util.CaseInsensitiveComparator" reference="../../../listView[2]/jobNames/comparator"/> | |
| - <string>I1-VAL_Deploy_Customer_Drugs</string> | |
| <string>I1-VAL_Deploy_M3</string> | |
| - <string>I1-VAL_Deploy_Meddra</string> | |
| <string>I1-VAL_Deploy_Puppet</string> | |
| </jobNames> | |
| <jobFilters> | |
| @@ -331,4 +326,4 @@ | |
| <label></label> | |
| <nodeProperties/> | |
| <globalNodeProperties/> | |
| -</hudson> | |
| \ No newline at end of file | |
| +</hudson> | |
| diff --git a/credentials.xml b/credentials.xml | |
| index 02b5f95..a0444e8 100644 | |
| --- a/credentials.xml | |
| +++ b/credentials.xml | |
| @@ -1,12 +1,12 @@ | |
| <?xml version='1.0' encoding='UTF-8'?> | |
| -<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@1.7.4"> | |
| +<com.cloudbees.plugins.credentials.SystemCredentialsProvider plugin="credentials@1.18"> | |
| <domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash"> | |
| <entry> | |
| <com.cloudbees.plugins.credentials.domains.Domain> | |
| <specifications/> | |
| </com.cloudbees.plugins.credentials.domains.Domain> | |
| <java.util.concurrent.CopyOnWriteArrayList> | |
| - <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials@1.3"> | |
| + <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials@1.10"> | |
| <scope>GLOBAL</scope> | |
| <id>7b073d1f-dc57-4196-8bd7-82a0b03330cc</id> | |
| <description>deploy-user</description> | |
| @@ -14,6 +14,14 @@ | |
| <passphrase>zGmOngVmDA80mn49o5a6s7dvT4P2urQykQqd+1/L/AjcZ+ubqTHggHi/ZZAeuMdr</passphrase> | |
| <privateKeySource class="com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey$UsersPrivateKeySource"/> | |
| </com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey> | |
| + <com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey plugin="ssh-credentials@1.10"> | |
| + <scope>GLOBAL</scope> | |
| + <id>a595ac2d-dcc2-4ed1-b476-45202729eaaa</id> | |
| + <description></description> | |
| + <username>jenkins</username> | |
| + <passphrase>OGCSGw2mSc4ZAZT7FmictA==</passphrase> | |
| + <privateKeySource class="com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey$UsersPrivateKeySource"/> | |
| + </com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey> | |
| </java.util.concurrent.CopyOnWriteArrayList> | |
| </entry> | |
| </domainCredentialsMap> | |
| diff --git a/jenkins.security.QueueItemAuthenticatorConfiguration.xml b/jenkins.security.QueueItemAuthenticatorConfiguration.xml | |
| new file mode 100644 | |
| index 0000000..c88c7fe | |
| --- /dev/null | |
| +++ b/jenkins.security.QueueItemAuthenticatorConfiguration.xml | |
| @@ -0,0 +1,4 @@ | |
| +<?xml version='1.0' encoding='UTF-8'?> | |
| +<jenkins.security.QueueItemAuthenticatorConfiguration> | |
| + <authenticators/> | |
| +</jenkins.security.QueueItemAuthenticatorConfiguration> | |
| \ No newline at end of file | |
| diff --git a/jobs/Additional_ES_Tasks/config.xml b/jobs/Additional_ES_Tasks/config.xml | |
| index 372eb90..e13d966 100644 | |
| --- a/jobs/Additional_ES_Tasks/config.xml | |
| +++ b/jobs/Additional_ES_Tasks/config.xml | |
| @@ -4,7 +4,7 @@ | |
| <description></description> | |
| <keepDependencies>false</keepDependencies> | |
| <properties> | |
| - <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.8"> | |
| + <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.9.1"> | |
| <projectUrl>https://github.com/MyMedsAndMe/M3/</projectUrl> | |
| </com.coravy.hudson.plugins.github.GithubProjectProperty> | |
| <hudson.model.ParametersDefinitionProperty> | |
| @@ -34,11 +34,6 @@ | |
| <description></description> | |
| <defaultValue>false</defaultValue> | |
| </hudson.model.BooleanParameterDefinition> | |
| - <org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition plugin="nodelabelparameter@1.4"> | |
| - <name>M3_ENV</name> | |
| - <description></description> | |
| - <defaultValue></defaultValue> | |
| - </org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition> | |
| <hudson.model.StringParameterDefinition> | |
| <name>BRAND_NAME</name> | |
| <description></description> | |
| @@ -46,11 +41,11 @@ | |
| </hudson.model.StringParameterDefinition> | |
| </parameterDefinitions> | |
| </hudson.model.ParametersDefinitionProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| + <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22"> | |
| <autoRebuild>false</autoRebuild> | |
| </com.sonyericsson.rebuild.RebuildSettings> | |
| </properties> | |
| - <scm class="hudson.plugins.git.GitSCM" plugin="git@2.2.2"> | |
| + <scm class="hudson.plugins.git.GitSCM" plugin="git@2.2.7"> | |
| <configVersion>2</configVersion> | |
| <userRemoteConfigs> | |
| <hudson.plugins.git.UserRemoteConfig> | |
| @@ -112,11 +107,14 @@ fi</command> | |
| </builders> | |
| <publishers/> | |
| <buildWrappers> | |
| - <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1"> | |
| + <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.0"> | |
| <colorMapName>xterm</colorMapName> | |
| </hudson.plugins.ansicolor.AnsiColorBuildWrapper> | |
| - <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@1.4.1"> | |
| - <user>7b073d1f-dc57-4196-8bd7-82a0b03330cc</user> | |
| + <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@1.5"> | |
| + <credentialIds> | |
| + <string>7b073d1f-dc57-4196-8bd7-82a0b03330cc</string> | |
| + </credentialIds> | |
| + <ignoreMissing>false</ignoreMissing> | |
| </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper> | |
| </buildWrappers> | |
| </project> | |
| \ No newline at end of file | |
| diff --git a/jobs/Additional_Import_Tasks/config.xml b/jobs/Additional_Import_Tasks/config.xml | |
| index 3cc22d0..694a28c 100644 | |
| --- a/jobs/Additional_Import_Tasks/config.xml | |
| +++ b/jobs/Additional_Import_Tasks/config.xml | |
| @@ -64,11 +64,6 @@ | |
| <description></description> | |
| <defaultValue>false</defaultValue> | |
| </hudson.model.BooleanParameterDefinition> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_VERSION</name> | |
| - <description></description> | |
| - <defaultValue></defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| </parameterDefinitions> | |
| </hudson.model.ParametersDefinitionProperty> | |
| <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| @@ -175,13 +170,13 @@ | |
| case $UPDATE_MEDDRA in | |
| true) | |
| - UPDATE_MEDDRA="reportum_task:symlink_meddra reportum_task:import_meddra" | |
| + UPDATE_MEDDRA="reportum_task:import_meddra" | |
| ;; | |
| *) | |
| UPDATE_MEDDRA="" | |
| esac | |
| - fab ${M3_ENV},config_brand=${BRAND_NAME},config_meddra_version=${MEDDRA_VERSION} ${BODY_MAP_COMMAND} ${COLLOQUIALS} ${LIVER_INJURY} ${CONVULSIONS} ${CARDIAC} ${PML} ${INVESTIGATIONS} ${PATIENT_FRIENDLY_TERMS} ${UPDATE_CUSTOMER_DRUGS} ${UPDATE_MEDDRA} | |
| + fab ${M3_ENV},config_brand=${BRAND_NAME} ${BODY_MAP_COMMAND} ${COLLOQUIALS} ${LIVER_INJURY} ${CONVULSIONS} ${CARDIAC} ${PML} ${INVESTIGATIONS} ${PATIENT_FRIENDLY_TERMS} ${UPDATE_CUSTOMER_DRUGS} ${UPDATE_MEDDRA} | |
| else | |
| diff --git a/jobs/I1-PRE_Deploy_M3/config.xml b/jobs/I1-PRE_Deploy_M3/config.xml | |
| index 3d4511e..b31ace2 100644 | |
| --- a/jobs/I1-PRE_Deploy_M3/config.xml | |
| +++ b/jobs/I1-PRE_Deploy_M3/config.xml | |
| @@ -109,11 +109,6 @@ | |
| <description></description> | |
| <defaultValue>false</defaultValue> | |
| </hudson.model.BooleanParameterDefinition> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_VERSION</name> | |
| - <description></description> | |
| - <defaultValue>17.1</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| </parameterDefinitions> | |
| </hudson.model.ParametersDefinitionProperty> | |
| <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| diff --git a/jobs/I1-PRE_Deploy_Meddra/config.xml b/jobs/I1-PRE_Deploy_Meddra/config.xml | |
| deleted file mode 100644 | |
| index 47cafec..0000000 | |
| --- a/jobs/I1-PRE_Deploy_Meddra/config.xml | |
| +++ /dev/null | |
| @@ -1,70 +0,0 @@ | |
| -<?xml version='1.0' encoding='UTF-8'?> | |
| -<project> | |
| - <actions/> | |
| - <description></description> | |
| - <keepDependencies>false</keepDependencies> | |
| - <properties> | |
| - <hudson.model.ParametersDefinitionProperty> | |
| - <parameterDefinitions> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_TAG</name> | |
| - <description></description> | |
| - <defaultValue>master</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| - </parameterDefinitions> | |
| - </hudson.model.ParametersDefinitionProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| - <autoRebuild>false</autoRebuild> | |
| - </com.sonyericsson.rebuild.RebuildSettings> | |
| - </properties> | |
| - <scm class="hudson.scm.NullSCM"/> | |
| - <canRoam>true</canRoam> | |
| - <disabled>false</disabled> | |
| - <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> | |
| - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> | |
| - <triggers/> | |
| - <concurrentBuild>false</concurrentBuild> | |
| - <builders> | |
| - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.22"> | |
| - <configs> | |
| - <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | |
| - <configs> | |
| - <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | |
| - <properties>ENV=i1-pred-app1</properties> | |
| - </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | |
| - <org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter plugin="nodelabelparameter@1.4"> | |
| - <name>DEPLOY_SLAVE</name> | |
| - <nodeLabel>pre</nodeLabel> | |
| - </org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter> | |
| - </configs> | |
| - <projects>Meddra_Deployment_on_slave</projects> | |
| - <condition>ALWAYS</condition> | |
| - <triggerWithNoParameters>false</triggerWithNoParameters> | |
| - <block> | |
| - <buildStepFailureThreshold> | |
| - <name>FAILURE</name> | |
| - <ordinal>2</ordinal> | |
| - <color>RED</color> | |
| - <completeBuild>true</completeBuild> | |
| - </buildStepFailureThreshold> | |
| - <unstableThreshold> | |
| - <name>UNSTABLE</name> | |
| - <ordinal>1</ordinal> | |
| - <color>YELLOW</color> | |
| - <completeBuild>true</completeBuild> | |
| - </unstableThreshold> | |
| - <failureThreshold> | |
| - <name>FAILURE</name> | |
| - <ordinal>2</ordinal> | |
| - <color>RED</color> | |
| - <completeBuild>true</completeBuild> | |
| - </failureThreshold> | |
| - </block> | |
| - <buildAllNodesWithLabel>false</buildAllNodesWithLabel> | |
| - </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | |
| - </configs> | |
| - </hudson.plugins.parameterizedtrigger.TriggerBuilder> | |
| - </builders> | |
| - <publishers/> | |
| - <buildWrappers/> | |
| -</project> | |
| \ No newline at end of file | |
| diff --git a/jobs/I1-PROD_Deploy_M3/config.xml b/jobs/I1-PROD_Deploy_M3/config.xml | |
| index b66094a..bd3ce65 100644 | |
| --- a/jobs/I1-PROD_Deploy_M3/config.xml | |
| +++ b/jobs/I1-PROD_Deploy_M3/config.xml | |
| @@ -99,21 +99,6 @@ | |
| <description></description> | |
| <defaultValue>my_meds</defaultValue> | |
| </hudson.model.StringParameterDefinition> | |
| - <hudson.model.BooleanParameterDefinition> | |
| - <name>UPDATE_CUSTOMER_DRUGS</name> | |
| - <description></description> | |
| - <defaultValue>false</defaultValue> | |
| - </hudson.model.BooleanParameterDefinition> | |
| - <hudson.model.BooleanParameterDefinition> | |
| - <name>UPDATE_MEDDRA</name> | |
| - <description></description> | |
| - <defaultValue>false</defaultValue> | |
| - </hudson.model.BooleanParameterDefinition> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_VERSION</name> | |
| - <description></description> | |
| - <defaultValue>17.1</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| </parameterDefinitions> | |
| </hudson.model.ParametersDefinitionProperty> | |
| <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| @@ -211,7 +196,7 @@ DEPLOY_SLAVE=prod</properties> | |
| <nodeLabel>prod</nodeLabel> | |
| </org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter> | |
| </configs> | |
| - <projects>M3_Daemon_Control, Additional_Import_Tasks, Additional_ES_Tasks, Create_admin_user</projects> | |
| + <projects>M3_Daemon_Control, Additional_ES_Tasks, Additional_Import_Tasks, Create_admin_user</projects> | |
| <condition>ALWAYS</condition> | |
| <triggerWithNoParameters>false</triggerWithNoParameters> | |
| <block> | |
| diff --git a/jobs/I1-PROD_Deploy_Meddra/config.xml b/jobs/I1-PROD_Deploy_Meddra/config.xml | |
| deleted file mode 100644 | |
| index 49a3eda..0000000 | |
| --- a/jobs/I1-PROD_Deploy_Meddra/config.xml | |
| +++ /dev/null | |
| @@ -1,70 +0,0 @@ | |
| -<?xml version='1.0' encoding='UTF-8'?> | |
| -<project> | |
| - <actions/> | |
| - <description></description> | |
| - <keepDependencies>false</keepDependencies> | |
| - <properties> | |
| - <hudson.model.ParametersDefinitionProperty> | |
| - <parameterDefinitions> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_TAG</name> | |
| - <description></description> | |
| - <defaultValue>master</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| - </parameterDefinitions> | |
| - </hudson.model.ParametersDefinitionProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| - <autoRebuild>false</autoRebuild> | |
| - </com.sonyericsson.rebuild.RebuildSettings> | |
| - </properties> | |
| - <scm class="hudson.scm.NullSCM"/> | |
| - <canRoam>true</canRoam> | |
| - <disabled>false</disabled> | |
| - <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> | |
| - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> | |
| - <triggers/> | |
| - <concurrentBuild>false</concurrentBuild> | |
| - <builders> | |
| - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.22"> | |
| - <configs> | |
| - <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | |
| - <configs> | |
| - <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | |
| - <properties>ENV=i1-prodd-app1</properties> | |
| - </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | |
| - <org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter plugin="nodelabelparameter@1.4"> | |
| - <name>DEPLOY_SLAVE</name> | |
| - <nodeLabel>prod</nodeLabel> | |
| - </org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter> | |
| - </configs> | |
| - <projects>Meddra_Deployment_on_slave</projects> | |
| - <condition>ALWAYS</condition> | |
| - <triggerWithNoParameters>false</triggerWithNoParameters> | |
| - <block> | |
| - <buildStepFailureThreshold> | |
| - <name>FAILURE</name> | |
| - <ordinal>2</ordinal> | |
| - <color>RED</color> | |
| - <completeBuild>true</completeBuild> | |
| - </buildStepFailureThreshold> | |
| - <unstableThreshold> | |
| - <name>UNSTABLE</name> | |
| - <ordinal>1</ordinal> | |
| - <color>YELLOW</color> | |
| - <completeBuild>true</completeBuild> | |
| - </unstableThreshold> | |
| - <failureThreshold> | |
| - <name>FAILURE</name> | |
| - <ordinal>2</ordinal> | |
| - <color>RED</color> | |
| - <completeBuild>true</completeBuild> | |
| - </failureThreshold> | |
| - </block> | |
| - <buildAllNodesWithLabel>false</buildAllNodesWithLabel> | |
| - </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | |
| - </configs> | |
| - </hudson.plugins.parameterizedtrigger.TriggerBuilder> | |
| - </builders> | |
| - <publishers/> | |
| - <buildWrappers/> | |
| -</project> | |
| \ No newline at end of file | |
| diff --git a/jobs/I1-VAL_Deploy_Customer_Drugs/config.xml b/jobs/I1-VAL_Deploy_Customer_Drugs/config.xml | |
| deleted file mode 100644 | |
| index 4ebf7e7..0000000 | |
| --- a/jobs/I1-VAL_Deploy_Customer_Drugs/config.xml | |
| +++ /dev/null | |
| @@ -1,61 +0,0 @@ | |
| -<?xml version='1.0' encoding='UTF-8'?> | |
| -<project> | |
| - <actions/> | |
| - <description></description> | |
| - <keepDependencies>false</keepDependencies> | |
| - <properties> | |
| - <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.8"> | |
| - <projectUrl>https://github.com/MyMedsAndMe//customer_products/</projectUrl> | |
| - </com.coravy.hudson.plugins.github.GithubProjectProperty> | |
| - <hudson.model.ParametersDefinitionProperty> | |
| - <parameterDefinitions> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>CUSTOMER_DRUGS_TAG</name> | |
| - <description></description> | |
| - <defaultValue>master</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| - </parameterDefinitions> | |
| - </hudson.model.ParametersDefinitionProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| - <autoRebuild>false</autoRebuild> | |
| - </com.sonyericsson.rebuild.RebuildSettings> | |
| - </properties> | |
| - <scm class="hudson.plugins.git.GitSCM" plugin="git@2.2.2"> | |
| - <configVersion>2</configVersion> | |
| - <userRemoteConfigs> | |
| - <hudson.plugins.git.UserRemoteConfig> | |
| - <url>git@github.com:MyMedsAndMe/fabdeploy.git</url> | |
| - <credentialsId>7b073d1f-dc57-4196-8bd7-82a0b03330cc</credentialsId> | |
| - </hudson.plugins.git.UserRemoteConfig> | |
| - </userRemoteConfigs> | |
| - <branches> | |
| - <hudson.plugins.git.BranchSpec> | |
| - <name>origin/master</name> | |
| - </hudson.plugins.git.BranchSpec> | |
| - </branches> | |
| - <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> | |
| - <submoduleCfg class="list"/> | |
| - <extensions/> | |
| - </scm> | |
| - <canRoam>true</canRoam> | |
| - <disabled>false</disabled> | |
| - <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> | |
| - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> | |
| - <triggers/> | |
| - <concurrentBuild>true</concurrentBuild> | |
| - <builders> | |
| - <hudson.tasks.Shell> | |
| - <command>fab customer_products_env:euwest1-vald-app1,config_repo_revision=${CUSTOMER_DRUGS_TAG} customer_products_task:deploy | |
| -</command> | |
| - </hudson.tasks.Shell> | |
| - </builders> | |
| - <publishers/> | |
| - <buildWrappers> | |
| - <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1"> | |
| - <colorMapName>xterm</colorMapName> | |
| - </hudson.plugins.ansicolor.AnsiColorBuildWrapper> | |
| - <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@1.4.1"> | |
| - <user>7b073d1f-dc57-4196-8bd7-82a0b03330cc</user> | |
| - </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper> | |
| - </buildWrappers> | |
| -</project> | |
| \ No newline at end of file | |
| diff --git a/jobs/I1-VAL_Deploy_M3/config.xml b/jobs/I1-VAL_Deploy_M3/config.xml | |
| index 1a348a3..fab0760 100644 | |
| --- a/jobs/I1-VAL_Deploy_M3/config.xml | |
| +++ b/jobs/I1-VAL_Deploy_M3/config.xml | |
| @@ -99,21 +99,6 @@ | |
| <description></description> | |
| <defaultValue>my_meds</defaultValue> | |
| </hudson.model.StringParameterDefinition> | |
| - <hudson.model.BooleanParameterDefinition> | |
| - <name>UPDATE_CUSTOMER_DRUGS</name> | |
| - <description></description> | |
| - <defaultValue>false</defaultValue> | |
| - </hudson.model.BooleanParameterDefinition> | |
| - <hudson.model.BooleanParameterDefinition> | |
| - <name>UPDATE_MEDDRA</name> | |
| - <description></description> | |
| - <defaultValue>false</defaultValue> | |
| - </hudson.model.BooleanParameterDefinition> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_VERSION</name> | |
| - <description></description> | |
| - <defaultValue>17.1</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| </parameterDefinitions> | |
| </hudson.model.ParametersDefinitionProperty> | |
| <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| @@ -211,7 +196,7 @@ DEPLOY_SLAVE=val</properties> | |
| <nodeLabel>val</nodeLabel> | |
| </org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter> | |
| </configs> | |
| - <projects>M3_Daemon_Control, Additional_Import_Tasks, Additional_ES_Tasks, Create_admin_user</projects> | |
| + <projects>M3_Daemon_Control, Additional_ES_Tasks, Additional_Import_Tasks, Create_admin_user</projects> | |
| <condition>ALWAYS</condition> | |
| <triggerWithNoParameters>false</triggerWithNoParameters> | |
| <block> | |
| diff --git a/jobs/I1-VAL_Deploy_Meddra/config.xml b/jobs/I1-VAL_Deploy_Meddra/config.xml | |
| deleted file mode 100644 | |
| index 35204c6..0000000 | |
| --- a/jobs/I1-VAL_Deploy_Meddra/config.xml | |
| +++ /dev/null | |
| @@ -1,70 +0,0 @@ | |
| -<?xml version='1.0' encoding='UTF-8'?> | |
| -<project> | |
| - <actions/> | |
| - <description></description> | |
| - <keepDependencies>false</keepDependencies> | |
| - <properties> | |
| - <hudson.model.ParametersDefinitionProperty> | |
| - <parameterDefinitions> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_TAG</name> | |
| - <description></description> | |
| - <defaultValue>master</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| - </parameterDefinitions> | |
| - </hudson.model.ParametersDefinitionProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| - <autoRebuild>false</autoRebuild> | |
| - </com.sonyericsson.rebuild.RebuildSettings> | |
| - </properties> | |
| - <scm class="hudson.scm.NullSCM"/> | |
| - <canRoam>true</canRoam> | |
| - <disabled>false</disabled> | |
| - <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> | |
| - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> | |
| - <triggers/> | |
| - <concurrentBuild>false</concurrentBuild> | |
| - <builders> | |
| - <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.22"> | |
| - <configs> | |
| - <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | |
| - <configs> | |
| - <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | |
| - <properties>ENV=i1-vald-app1</properties> | |
| - </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | |
| - <org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter plugin="nodelabelparameter@1.4"> | |
| - <name>DEPLOY_SLAVE</name> | |
| - <nodeLabel>val</nodeLabel> | |
| - </org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.NodeLabelBuildParameter> | |
| - </configs> | |
| - <projects>Meddra_Deployment_on_slave</projects> | |
| - <condition>ALWAYS</condition> | |
| - <triggerWithNoParameters>false</triggerWithNoParameters> | |
| - <block> | |
| - <buildStepFailureThreshold> | |
| - <name>FAILURE</name> | |
| - <ordinal>2</ordinal> | |
| - <color>RED</color> | |
| - <completeBuild>true</completeBuild> | |
| - </buildStepFailureThreshold> | |
| - <unstableThreshold> | |
| - <name>UNSTABLE</name> | |
| - <ordinal>1</ordinal> | |
| - <color>YELLOW</color> | |
| - <completeBuild>true</completeBuild> | |
| - </unstableThreshold> | |
| - <failureThreshold> | |
| - <name>FAILURE</name> | |
| - <ordinal>2</ordinal> | |
| - <color>RED</color> | |
| - <completeBuild>true</completeBuild> | |
| - </failureThreshold> | |
| - </block> | |
| - <buildAllNodesWithLabel>false</buildAllNodesWithLabel> | |
| - </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | |
| - </configs> | |
| - </hudson.plugins.parameterizedtrigger.TriggerBuilder> | |
| - </builders> | |
| - <publishers/> | |
| - <buildWrappers/> | |
| -</project> | |
| \ No newline at end of file | |
| diff --git a/jobs/Meddra_Deployment_on_slave/config.xml b/jobs/Meddra_Deployment_on_slave/config.xml | |
| deleted file mode 100644 | |
| index fd46357..0000000 | |
| --- a/jobs/Meddra_Deployment_on_slave/config.xml | |
| +++ /dev/null | |
| @@ -1,67 +0,0 @@ | |
| -<?xml version='1.0' encoding='UTF-8'?> | |
| -<project> | |
| - <actions/> | |
| - <description></description> | |
| - <keepDependencies>false</keepDependencies> | |
| - <properties> | |
| - <hudson.model.ParametersDefinitionProperty> | |
| - <parameterDefinitions> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>MEDDRA_TAG</name> | |
| - <description></description> | |
| - <defaultValue>master</defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| - <hudson.model.StringParameterDefinition> | |
| - <name>ENV</name> | |
| - <description></description> | |
| - <defaultValue></defaultValue> | |
| - </hudson.model.StringParameterDefinition> | |
| - <org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition plugin="nodelabelparameter@1.4"> | |
| - <name>DEPLOY_SLAVE</name> | |
| - <description></description> | |
| - <defaultValue></defaultValue> | |
| - </org.jvnet.jenkins.plugins.nodelabelparameter.LabelParameterDefinition> | |
| - </parameterDefinitions> | |
| - </hudson.model.ParametersDefinitionProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| - <autoRebuild>false</autoRebuild> | |
| - </com.sonyericsson.rebuild.RebuildSettings> | |
| - </properties> | |
| - <scm class="hudson.plugins.git.GitSCM" plugin="git@2.2.2"> | |
| - <configVersion>2</configVersion> | |
| - <userRemoteConfigs> | |
| - <hudson.plugins.git.UserRemoteConfig> | |
| - <url>git@github.com:MyMedsAndMe/fabdeploy.git</url> | |
| - <credentialsId>7b073d1f-dc57-4196-8bd7-82a0b03330cc</credentialsId> | |
| - </hudson.plugins.git.UserRemoteConfig> | |
| - </userRemoteConfigs> | |
| - <branches> | |
| - <hudson.plugins.git.BranchSpec> | |
| - <name>origin/master</name> | |
| - </hudson.plugins.git.BranchSpec> | |
| - </branches> | |
| - <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> | |
| - <submoduleCfg class="list"/> | |
| - <extensions/> | |
| - </scm> | |
| - <canRoam>true</canRoam> | |
| - <disabled>false</disabled> | |
| - <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> | |
| - <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> | |
| - <triggers/> | |
| - <concurrentBuild>false</concurrentBuild> | |
| - <builders> | |
| - <hudson.tasks.Shell> | |
| - <command>fab meddra_env:${ENV},config_repo_revision=${MEDDRA_TAG} meddra_task:deploy</command> | |
| - </hudson.tasks.Shell> | |
| - </builders> | |
| - <publishers/> | |
| - <buildWrappers> | |
| - <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.3.1"> | |
| - <colorMapName>xterm</colorMapName> | |
| - </hudson.plugins.ansicolor.AnsiColorBuildWrapper> | |
| - <com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper plugin="ssh-agent@1.4.1"> | |
| - <user>7b073d1f-dc57-4196-8bd7-82a0b03330cc</user> | |
| - </com.cloudbees.jenkins.plugins.sshagent.SSHAgentBuildWrapper> | |
| - </buildWrappers> | |
| -</project> | |
| \ No newline at end of file | |
| diff --git a/jobs/jenkins_config_backup/config.xml b/jobs/jenkins_config_backup/config.xml | |
| index 4f8b558..e51df4a 100644 | |
| --- a/jobs/jenkins_config_backup/config.xml | |
| +++ b/jobs/jenkins_config_backup/config.xml | |
| @@ -10,10 +10,10 @@ | |
| </logRotator> | |
| <keepDependencies>false</keepDependencies> | |
| <properties> | |
| - <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.8"> | |
| + <com.coravy.hudson.plugins.github.GithubProjectProperty plugin="github@1.9.1"> | |
| <projectUrl>https://github.com/MyMedsAndMe/Jenkins/</projectUrl> | |
| </com.coravy.hudson.plugins.github.GithubProjectProperty> | |
| - <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.20"> | |
| + <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.22"> | |
| <autoRebuild>false</autoRebuild> | |
| </com.sonyericsson.rebuild.RebuildSettings> | |
| </properties> | |
| @@ -49,12 +49,13 @@ git commit -a -m "Automated Jenkins commit" || echo "NO_CHANGES&q | |
| ## push changes up | |
| ## Branch name changed from Iperion-NEW to Iperion-Final by Mike Griffiths 2013-11-07 15:30:00 | |
| -git push -q origin Iperion-Final | |
| +## Branch name changed from Iperion-Final to FauxPerion by Andrew Stangl 2015-01-30 13:40:00 | |
| +git push -q origin FauxPerion | |
| </command> | |
| </hudson.tasks.Shell> | |
| </builders> | |
| <publishers> | |
| - <hudson.plugins.textfinder.TextFinderPublisher plugin="text-finder@1.9"> | |
| + <hudson.plugins.textfinder.TextFinderPublisher plugin="text-finder@1.10"> | |
| <regexp>NO_CHANGES</regexp> | |
| <succeedIfFound>false</succeedIfFound> | |
| <unstableIfFound>true</unstableIfFound> | |
| diff --git a/users/marco.tanzi/config.xml b/users/marco.tanzi/config.xml | |
| deleted file mode 100644 | |
| index 4f57db7..0000000 | |
| --- a/users/marco.tanzi/config.xml | |
| +++ /dev/null | |
| @@ -1,38 +0,0 @@ | |
| -<?xml version='1.0' encoding='UTF-8'?> | |
| -<user> | |
| - <fullName>marco.tanzi</fullName> | |
| - <properties> | |
| - <hudson.model.PaneStatusProperties> | |
| - <collapsed/> | |
| - </hudson.model.PaneStatusProperties> | |
| - <jenkins.security.ApiTokenProperty> | |
| - <apiToken>i9W8P+3rgjHNzwmAkLY5QvnvI/muWvyoVf5w1BKK+xQ4YJIbDaZJzhkBlPsWaJy0</apiToken> | |
| - </jenkins.security.ApiTokenProperty> | |
| - <com.cloudbees.plugins.credentials.UserCredentialsProvider_-UserCredentialsProperty plugin="credentials@1.14"> | |
| - <domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash"/> | |
| - </com.cloudbees.plugins.credentials.UserCredentialsProvider_-UserCredentialsProperty> | |
| - <hudson.tasks.Mailer_-UserProperty plugin="mailer@1.11"/> | |
| - <hudson.model.MyViewsProperty> | |
| - <views> | |
| - <hudson.model.AllView> | |
| - <owner class="hudson.model.MyViewsProperty" reference="../../.."/> | |
| - <name>All</name> | |
| - <filterExecutors>false</filterExecutors> | |
| - <filterQueue>false</filterQueue> | |
| - <properties class="hudson.model.View$PropertyList"/> | |
| - </hudson.model.AllView> | |
| - </views> | |
| - </hudson.model.MyViewsProperty> | |
| - <hudson.search.UserSearchProperty> | |
| - <insensitiveSearch>false</insensitiveSearch> | |
| - </hudson.search.UserSearchProperty> | |
| - <jenkins.security.LastGrantedAuthoritiesProperty> | |
| - <roles> | |
| - <string>ROLE_ADMINISTRATORS</string> | |
| - <string>authenticated</string> | |
| - <string>Administrators</string> | |
| - </roles> | |
| - <timestamp>1420813145569</timestamp> | |
| - </jenkins.security.LastGrantedAuthoritiesProperty> | |
| - </properties> | |
| -</user> | |
| \ No newline at end of file | |
| diff --git a/users/mikem/config.xml b/users/mikem/config.xml | |
| index 4115440..cb7a148 100644 | |
| --- a/users/mikem/config.xml | |
| +++ b/users/mikem/config.xml | |
| @@ -8,7 +8,7 @@ | |
| <jenkins.security.ApiTokenProperty> | |
| <apiToken>LS7GZLVfI3HyDZ2odJ34sYhFIDlGu8qqc1EbLvV0FcA4YJIbDaZJzhkBlPsWaJy0</apiToken> | |
| </jenkins.security.ApiTokenProperty> | |
| - <com.cloudbees.plugins.credentials.UserCredentialsProvider_-UserCredentialsProperty plugin="credentials@1.14"> | |
| + <com.cloudbees.plugins.credentials.UserCredentialsProvider_-UserCredentialsProperty plugin="credentials@1.18"> | |
| <domainCredentialsMap class="hudson.util.CopyOnWriteMap$Hash"/> | |
| </com.cloudbees.plugins.credentials.UserCredentialsProvider_-UserCredentialsProperty> | |
| <hudson.model.MyViewsProperty> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment