Skip to content
This repository has been archived by the owner on May 15, 2018. It is now read-only.

Commit

Permalink
Switch to mozharness as test runner (#642)
Browse files Browse the repository at this point in the history
  • Loading branch information
@whimboo
whimboo committed Nov 25, 2015
1 parent e4cde8b commit 943f773
Show file tree
Hide file tree
Showing 13 changed files with 281 additions and 378 deletions.
6 changes: 3 additions & 3 deletions config/production/jenkins.patch
View file
@@ -1,5 +1,5 @@
diff --git a/jenkins-master/config.xml b/jenkins-master/config.xml
index a2d98a6..9fd2a63 100644
index bd544ad..7a9ae47 100644
--- a/jenkins-master/config.xml
+++ b/jenkins-master/config.xml
@@ -17,16 +17,708 @@
Expand Down Expand Up @@ -798,7 +798,7 @@ index e6be56d..785729a 100644
<artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
diff --git a/jenkins-master/jobs/mozilla-central_functional/config.xml b/jenkins-master/jobs/mozilla-central_functional/config.xml
index 92a9cf5..bcb8fdd 100644
index 615040d..5fe5c26 100644
--- a/jenkins-master/jobs/mozilla-central_functional/config.xml
+++ b/jenkins-master/jobs/mozilla-central_functional/config.xml
@@ -3,8 +3,8 @@
Expand All @@ -813,7 +813,7 @@ index 92a9cf5..bcb8fdd 100644
<artifactNumToKeep>-1</artifactNumToKeep>
</logRotator>
diff --git a/jenkins-master/jobs/mozilla-central_update/config.xml b/jenkins-master/jobs/mozilla-central_update/config.xml
index dcdeb1a..b4e6997 100644
index 47c5f4d..94fbbed 100644
--- a/jenkins-master/jobs/mozilla-central_update/config.xml
+++ b/jenkins-master/jobs/mozilla-central_update/config.xml
@@ -3,8 +3,8 @@
Expand Down
2 changes: 1 addition & 1 deletion jenkins-master/config.xml
View file
Expand Up @@ -234,7 +234,7 @@
</default>
<int>6</int>
<string>MOZHARNESS_REVISION</string>
<string>49b1fe014eea</string>
<string>d9243e369c22</string>
<string>MOZMILL_AUTOMATION_VERSION</string>
<string>2.0.10.2</string>
<string>NOTIFICATION_ADDRESS</string>
Expand Down
38 changes: 8 additions & 30 deletions jenkins-master/jobs/mozilla-aurora_functional/config.xml
View file
Expand Up @@ -48,32 +48,9 @@
<contributors/>
</EnvInjectJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM" plugin="git@2.3.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/mozilla/firefox-ui-tests.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>*/mozilla-aurora</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
<extensions>
<hudson.plugins.git.extensions.impl.LocalBranch>
<localBranch>mozilla-aurora</localBranch>
</hudson.plugins.git.extensions.impl.LocalBranch>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<reference></reference>
</hudson.plugins.git.extensions.impl.CloneOption>
<hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
<relativeTargetDir>firefox-ui-tests</relativeTargetDir>
</hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
</extensions>
<scm class="hudson.plugins.cloneworkspace.CloneWorkspaceSCM" plugin="clone-workspace-scm@0.5">
<parentJobName>get_mozharness</parentJobName>
<criteria>Successful</criteria>
</scm>
<canRoam>true</canRoam>
<disabled>false</disabled>
Expand All @@ -86,20 +63,22 @@
<project>scripts</project>
<filter></filter>
<target></target>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector">
<stable>true</stable>
</selector>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python -u submission.py --test-type=functional --build-state=running --repository=mozilla-aurora --revision=$REVISION --locale=$LOCALE treeherder_venv</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python runtests.py --type=functional --installer-url=$INSTALLER_URL</commandLine>
<commandLine>python -u runtests.py --test-type=functional --repository=mozilla-aurora --installer-url=$INSTALLER_URL</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
</builders>
<publishers>
<hudson.tasks.ArtifactArchiver>
<artifacts>build/upload/*.*</artifacts>
<artifacts>build/upload/**,minidumps/**</artifacts>
<allowEmptyArchive>true</allowEmptyArchive>
<onlyIfSuccessful>false</onlyIfSuccessful>
<fingerprint>false</fingerprint>
Expand Down Expand Up @@ -195,7 +174,6 @@ ${FAILED_TESTS}
<timeoutType>absolute</timeoutType>
<timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.0">
<colorMapName>xterm</colorMapName>
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
Expand Down
38 changes: 8 additions & 30 deletions jenkins-master/jobs/mozilla-aurora_update/config.xml
View file
Expand Up @@ -65,32 +65,9 @@ NSPR_LOG_FILE=http.log</propertiesContent>
<contributors/>
</EnvInjectJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM" plugin="git@2.3.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/mozilla/firefox-ui-tests.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>*/mozilla-aurora</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
<extensions>
<hudson.plugins.git.extensions.impl.LocalBranch>
<localBranch>mozilla-aurora</localBranch>
</hudson.plugins.git.extensions.impl.LocalBranch>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<reference></reference>
</hudson.plugins.git.extensions.impl.CloneOption>
<hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
<relativeTargetDir>firefox-ui-tests</relativeTargetDir>
</hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
</extensions>
<scm class="hudson.plugins.cloneworkspace.CloneWorkspaceSCM" plugin="clone-workspace-scm@0.5">
<parentJobName>get_mozharness</parentJobName>
<criteria>Successful</criteria>
</scm>
<canRoam>true</canRoam>
<disabled>false</disabled>
Expand All @@ -103,20 +80,22 @@ NSPR_LOG_FILE=http.log</propertiesContent>
<project>scripts</project>
<filter></filter>
<target></target>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector">
<stable>true</stable>
</selector>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python -u submission.py --test-type=update --build-state=running --repository=mozilla-aurora --revision=$REVISION --locale=$LOCALE --update-number=$UPDATE_NUMBER treeherder_venv</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python runtests.py --type=update --installer-url=$INSTALLER_URL --update-channel=$CHANNEL --update-target-build-id=$TARGET_BUILD_ID</commandLine>
<commandLine>python -u runtests.py --test-type=update --repository=mozilla-aurora --installer-url=$INSTALLER_URL --update-channel=$CHANNEL --update-target-build-id=$TARGET_BUILD_ID</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
</builders>
<publishers>
<hudson.tasks.ArtifactArchiver>
<artifacts>build/upload/*.*</artifacts>
<artifacts>build/http.log,build/upload/**,minidumps/**</artifacts>
<allowEmptyArchive>true</allowEmptyArchive>
<onlyIfSuccessful>false</onlyIfSuccessful>
<fingerprint>false</fingerprint>
Expand Down Expand Up @@ -212,7 +191,6 @@ ${FAILED_TESTS}
<timeoutType>absolute</timeoutType>
<timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.0">
<colorMapName>xterm</colorMapName>
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
Expand Down
38 changes: 8 additions & 30 deletions jenkins-master/jobs/mozilla-central_functional/config.xml
View file
Expand Up @@ -48,32 +48,9 @@
<contributors/>
</EnvInjectJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM" plugin="git@2.3.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/mozilla/firefox-ui-tests.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>*/mozilla-central</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
<extensions>
<hudson.plugins.git.extensions.impl.LocalBranch>
<localBranch>mozilla-central</localBranch>
</hudson.plugins.git.extensions.impl.LocalBranch>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<reference></reference>
</hudson.plugins.git.extensions.impl.CloneOption>
<hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
<relativeTargetDir>firefox-ui-tests</relativeTargetDir>
</hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
</extensions>
<scm class="hudson.plugins.cloneworkspace.CloneWorkspaceSCM" plugin="clone-workspace-scm@0.5">
<parentJobName>get_mozharness</parentJobName>
<criteria>Successful</criteria>
</scm>
<canRoam>true</canRoam>
<disabled>false</disabled>
Expand All @@ -86,20 +63,22 @@
<project>scripts</project>
<filter></filter>
<target></target>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector">
<stable>true</stable>
</selector>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python -u submission.py --test-type=functional --build-state=running --repository=mozilla-central --revision=$REVISION --locale=$LOCALE treeherder_venv</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python runtests.py --type=functional --installer-url=$INSTALLER_URL</commandLine>
<commandLine>python -u runtests.py --test-type=functional --repository=mozilla-central --installer-url=$INSTALLER_URL</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
</builders>
<publishers>
<hudson.tasks.ArtifactArchiver>
<artifacts>build/upload/*.*</artifacts>
<artifacts>build/upload/**,minidumps/**</artifacts>
<allowEmptyArchive>true</allowEmptyArchive>
<onlyIfSuccessful>false</onlyIfSuccessful>
<fingerprint>false</fingerprint>
Expand Down Expand Up @@ -195,7 +174,6 @@ ${FAILED_TESTS}
<timeoutType>absolute</timeoutType>
<timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.0">
<colorMapName>xterm</colorMapName>
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
Expand Down
38 changes: 8 additions & 30 deletions jenkins-master/jobs/mozilla-central_update/config.xml
View file
Expand Up @@ -65,32 +65,9 @@ NSPR_LOG_FILE=http.log</propertiesContent>
<contributors/>
</EnvInjectJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM" plugin="git@2.3.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/mozilla/firefox-ui-tests.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>*/mozilla-central</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
<extensions>
<hudson.plugins.git.extensions.impl.LocalBranch>
<localBranch>master</localBranch>
</hudson.plugins.git.extensions.impl.LocalBranch>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<reference></reference>
</hudson.plugins.git.extensions.impl.CloneOption>
<hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
<relativeTargetDir>firefox-ui-tests</relativeTargetDir>
</hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
</extensions>
<scm class="hudson.plugins.cloneworkspace.CloneWorkspaceSCM" plugin="clone-workspace-scm@0.5">
<parentJobName>get_mozharness</parentJobName>
<criteria>Successful</criteria>
</scm>
<canRoam>true</canRoam>
<disabled>false</disabled>
Expand All @@ -103,20 +80,22 @@ NSPR_LOG_FILE=http.log</propertiesContent>
<project>scripts</project>
<filter></filter>
<target></target>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector">
<stable>true</stable>
</selector>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python -u submission.py --test-type=update --build-state=running --repository=mozilla-central --revision=$REVISION --locale=$LOCALE --update-number=$UPDATE_NUMBER treeherder_venv</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python runtests.py --type=update --installer-url=$INSTALLER_URL --update-channel=$CHANNEL --update-target-build-id=$TARGET_BUILD_ID</commandLine>
<commandLine>python -u runtests.py --test-type=update --repository=mozilla-central --installer-url=$INSTALLER_URL --update-channel=$CHANNEL --update-target-build-id=$TARGET_BUILD_ID</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
</builders>
<publishers>
<hudson.tasks.ArtifactArchiver>
<artifacts>build/upload/*.*</artifacts>
<artifacts>build/http.log,build/upload/**,minidumps/**</artifacts>
<allowEmptyArchive>true</allowEmptyArchive>
<onlyIfSuccessful>false</onlyIfSuccessful>
<fingerprint>false</fingerprint>
Expand Down Expand Up @@ -212,7 +191,6 @@ ${FAILED_TESTS}
<timeoutType>absolute</timeoutType>
<timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.0">
<colorMapName>xterm</colorMapName>
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
Expand Down
38 changes: 8 additions & 30 deletions jenkins-master/jobs/release-mozilla-beta_functional/config.xml
View file
Expand Up @@ -48,32 +48,9 @@
<contributors/>
</EnvInjectJobProperty>
</properties>
<scm class="hudson.plugins.git.GitSCM" plugin="git@2.3.5">
<configVersion>2</configVersion>
<userRemoteConfigs>
<hudson.plugins.git.UserRemoteConfig>
<url>https://github.com/mozilla/firefox-ui-tests.git</url>
</hudson.plugins.git.UserRemoteConfig>
</userRemoteConfigs>
<branches>
<hudson.plugins.git.BranchSpec>
<name>*/mozilla-beta</name>
</hudson.plugins.git.BranchSpec>
</branches>
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
<submoduleCfg class="list"/>
<extensions>
<hudson.plugins.git.extensions.impl.LocalBranch>
<localBranch>mozilla-beta</localBranch>
</hudson.plugins.git.extensions.impl.LocalBranch>
<hudson.plugins.git.extensions.impl.CloneOption>
<shallow>true</shallow>
<reference></reference>
</hudson.plugins.git.extensions.impl.CloneOption>
<hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
<relativeTargetDir>firefox-ui-tests</relativeTargetDir>
</hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
</extensions>
<scm class="hudson.plugins.cloneworkspace.CloneWorkspaceSCM" plugin="clone-workspace-scm@0.5">
<parentJobName>get_mozharness</parentJobName>
<criteria>Successful</criteria>
</scm>
<canRoam>true</canRoam>
<disabled>false</disabled>
Expand All @@ -86,20 +63,22 @@
<project>scripts</project>
<filter></filter>
<target></target>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector"/>
<selector class="hudson.plugins.copyartifact.StatusBuildSelector">
<stable>true</stable>
</selector>
</hudson.plugins.copyartifact.CopyArtifact>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python -u submission.py --test-type=functional --build-state=running --repository=mozilla-beta --revision=$REVISION --locale=$LOCALE treeherder_venv</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
<hudson.plugins.xshell.XShellBuilder plugin="xshell@0.9-SNAPSHOT">
<commandLine>python runtests.py --type=functional --installer-url=$INSTALLER_URL</commandLine>
<commandLine>python -u runtests.py --test-type=functional --repository=mozilla-beta --installer-url=$INSTALLER_URL</commandLine>
<executeFromWorkingDir>false</executeFromWorkingDir>
</hudson.plugins.xshell.XShellBuilder>
</builders>
<publishers>
<hudson.tasks.ArtifactArchiver>
<artifacts>build/upload/*.*</artifacts>
<artifacts>build/upload/**,minidumps/**</artifacts>
<allowEmptyArchive>true</allowEmptyArchive>
<onlyIfSuccessful>false</onlyIfSuccessful>
<fingerprint>false</fingerprint>
Expand Down Expand Up @@ -195,7 +174,6 @@ ${FAILED_TESTS}
<timeoutType>absolute</timeoutType>
<timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
<hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.5.14"/>
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.0">
<colorMapName>xterm</colorMapName>
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
Expand Down

0 comments on commit 943f773

Please sign in to comment.