|
75 | 75 | </target> |
76 | 76 |
|
77 | 77 | <target |
78 | | - name="installPreferences" |
79 | | - depends="initStreamSpecificProperties"> |
| 78 | + name="installPreferences"> |
80 | 79 | <property |
81 | 80 | name="preferenceDirectory" |
82 | 81 | value="${eclipse-home}/configuration/.settings/" /> |
|
469 | 468 | </target> |
470 | 469 | <target |
471 | 470 | name="initProductionProperties" |
| 471 | + unless="productionPropertiesInitialized" |
472 | 472 | depends="initWorkspace"> |
473 | 473 | <!-- |
474 | 474 | during production testing, previous steps persists some properties |
|
477 | 477 | --> |
478 | 478 | <property file="${WORKSPACE}/production.properties" /> |
479 | 479 |
|
480 | | - </target> |
481 | | - <target |
482 | | - name="initBuildId" |
483 | | - unless="buildId"> |
484 | | - <!--property file that can contain the buildId, if not otherwise set --> |
485 | | - <property file="label.properties" /> |
486 | | - <fail |
487 | | - unless="buildId" |
488 | | - message="buildId (e.g I20140731-0800) needs to be provided to run the tests" /> |
| 480 | + <echo message="eclipseStreamMajor: ${eclipseStreamMajor}"/> |
| 481 | + <echo message="eclipseStreamMinor: ${eclipseStreamMinor}"/> |
| 482 | + <fail unless="eclipseStreamMajor" |
| 483 | + message="eclipseStreamMajor not defined or computable" /> |
| 484 | + <fail unless="eclipseStreamMinor" |
| 485 | + message="eclipseStreamMinor not defined or computable" /> |
| 486 | + |
| 487 | + <property name="productionPropertiesInitialized" value="true" /> |
489 | 488 | </target> |
490 | 489 |
|
491 | 490 | <target |
492 | 491 | name="initBuildType" |
493 | | - depends="initBuildId" |
494 | 492 | unless="buildType"> |
495 | 493 |
|
496 | 494 | <fail |
|
534 | 532 | </target> |
535 | 533 | <target |
536 | 534 | name="initCurrentUpdateSite" |
537 | | - depends="initDownloadHosts, initStreamVariables, initBuildId, initBuildType" |
| 535 | + depends="initDownloadHosts, initProductionProperties, initBuildType" |
538 | 536 | unless="currentUpdateSite"> |
539 | 537 | <property |
540 | 538 | name="currentUpdateSite" |
541 | 539 | value="https://${DOWNLOAD_HOST}/eclipse/updates/${updateSiteSegment}-${buildType}-builds/${buildId}" /> |
542 | 540 | </target> |
543 | | - <target |
544 | | - name="initStreamSpecificProperties" |
545 | | - depends="initConfigurationDir" |
546 | | - unless="streamSpecificPropertiesSet"> |
547 | | - <!-- |
548 | | - Note: configurationDir used to be set by runTest2.xml in 'production' |
549 | | - environment only. We may want to set to basedir, if not already set. |
550 | | - But, this file, streamSpecific.properties should always be optional. |
551 | | - TODO: better document what is in that file. |
552 | | - --> |
553 | | - |
554 | | - <property file="${configurationDir}/streamSpecific.properties" /> |
555 | | - <property |
556 | | - name="streamSpecificPropertiesSet" |
557 | | - value="true" /> |
558 | | - </target> |
559 | | - |
560 | | - <!-- |
561 | | - main purpose of initStreamVariables, it to be sure we have eclipseStreamMajor |
562 | | - and eclipseStreamMinor. Uses Javascript, which requires Java 1.6 (or ... else gets complicated to |
563 | | - setup) |
564 | | - --> |
565 | | - <target |
566 | | - name="initStreamVariables" |
567 | | - depends="initDownloadHosts,initConfigurationDir,initStreamSpecificProperties"> |
568 | | - |
569 | | - <property file="${configurationDir}/streamSpecific.properties" /> |
570 | | - <fail |
571 | | - unless="eclipseStream" |
572 | | - message="eclipseStream value must be provided by caller, such as '4.3.0'." /> |
573 | | - <!-- |
574 | | - Not clear why, but I've seen "eclipseStream" value have a trailing |
575 | | - ?blank? that gets picked up when read in as string. |
576 | | - Seems it might be a couple of ant issues? |
577 | | - Luckily we never use it as a whole string (just major and minor) |
578 | | - so we can ignore spaces. |
579 | | - --> |
580 | | - <condition property="streamOK"> |
581 | | - <matches |
582 | | - pattern="^\s*\d+\.\d+(\.\d+)?\s*$" |
583 | | - string="${eclipseStream}" /> |
584 | | - </condition> |
585 | | - <fail |
586 | | - message="eclipseStream variable had unexpected format. Should be of form digit.digit[.digit], but was ${eclipseStream}" |
587 | | - unless="streamOK" /> |
588 | | - |
589 | | - <loadresource property="eclipseStreamMajor"> |
590 | | - <string value="${eclipseStream}"/> |
591 | | - <filterchain> |
592 | | - <tokenfilter> |
593 | | - <replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\1"/> |
594 | | - </tokenfilter> |
595 | | - </filterchain> |
596 | | - </loadresource> |
597 | | - <echo message="eclipseStreamMajor: ${eclipseStreamMajor}"/> |
598 | | - |
599 | | - <loadresource property="eclipseStreamMinor"> |
600 | | - <string value="${eclipseStream}"/> |
601 | | - <filterchain> |
602 | | - <tokenfilter> |
603 | | - <replaceregex pattern="^(\d+)\.(\d+)(\.(\d+))" replace="\2"/> |
604 | | - </tokenfilter> |
605 | | - </filterchain> |
606 | | - </loadresource> |
607 | | - <echo message="eclipseStreamMinor: ${eclipseStreamMinor}"/> |
608 | | - <fail |
609 | | - unless="eclipseStreamMajor" |
610 | | - message="eclipseStreamMajor not defined or computable" /> |
611 | | - <fail |
612 | | - unless="eclipseStreamMinor" |
613 | | - message="eclipseStreamMinor not defined or computable" /> |
614 | | - <!-- |
615 | | - <fail |
616 | | - unless="eclipseStreamService" |
617 | | - message="eclipseStreamService not defined or computable" /> |
618 | | - --> |
619 | | - </target> |
620 | 541 |
|
621 | 542 | <target |
622 | 543 | name="initBasicDirectories" |
623 | | - depends="initWorkspace,initBuildId, initStreamSpecificProperties,initInstallDir, initEclipseHome" |
| 544 | + depends="initWorkspace, initInstallDir, initEclipseHome" |
624 | 545 | unless="basicDirectoriesInitialized"> |
625 | 546 |
|
| 547 | + <fail |
| 548 | + unless="buildId" |
| 549 | + message="buildId value must be provided by caller (such as 'I20120717-0800'" /> |
| 550 | + |
626 | 551 | <property environment="env" /> |
627 | 552 |
|
628 | | - <property |
629 | | - name="repoBuildIdToUse" |
630 | | - value="${buildId}" /> |
631 | 553 | <property |
632 | 554 | name="repoZip" |
633 | | - value="${executionDir}/eclipse-junit-tests-${repoBuildIdToUse}.zip" /> |
| 555 | + value="${executionDir}/eclipse-junit-tests-${buildId}.zip" /> |
634 | 556 | <echo message="repoZip: ${repoZip}" /> |
635 | 557 |
|
636 | 558 | <property |
|
687 | 609 | </copy> |
688 | 610 | </target> |
689 | 611 |
|
690 | | - <target name="initConfigurationDir"> |
691 | | - <property |
692 | | - name="configurationDir" |
693 | | - value="${WORKSPACE}/eclipse.platform.releng.aggregator/production/testScripts/configuration" /> |
694 | | - </target> |
695 | | - |
696 | 612 | <target |
697 | 613 | name="initInstallDir" |
698 | | - depends="initBuildId, initStreamSpecificProperties, checkInstallDir" |
| 614 | + depends="checkInstallDir" |
699 | 615 | unless="install"> |
700 | 616 | <property |
701 | 617 | name="testDir" |
|
732 | 648 | --> |
733 | 649 | <target |
734 | 650 | name="initEclipseHome" |
735 | | - depends="initStreamSpecificProperties, initInstallDir, checkEclipseHome" |
| 651 | + depends="initInstallDir, checkEclipseHome" |
736 | 652 | unless="eclipse-home"> |
737 | 653 |
|
738 | 654 | <condition |
|
784 | 700 |
|
785 | 701 | <target |
786 | 702 | name="init" |
787 | | - depends="initWorkspace,initProductionProperties,initBuildId, initBuildType, initDownloadHosts, initStreamVariables, initCurrentUpdateSite, initBasicDirectories,initPlatformAndRuntimeArchiveName" |
| 703 | + depends="initWorkspace,initProductionProperties, initBuildType, initDownloadHosts, initCurrentUpdateSite, initBasicDirectories,initPlatformAndRuntimeArchiveName" |
788 | 704 | unless="testingIsInitialized"> |
789 | 705 |
|
790 | 706 | <!-- Make sure the values of os, ws, and arch are set. --> |
|
851 | 767 | <property |
852 | 768 | name="org.eclipse.equinox.p2.reconciler.tests.platform.archive" |
853 | 769 | value="${executionDir}/${platformArchive}" /> |
854 | | - <property |
855 | | - name="org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive" |
856 | | - value="NotCurrentlyImplementedOrUsed" /> |
857 | 770 | <property |
858 | 771 | name="org.eclipse.equinox.p2.tests.current.build.repo" |
859 | 772 | value="${current.build.repo}" /> |
|
887 | 800 | message="org.eclipse.equinox.p2.reconciler.tests.platform.archive=${org.eclipse.equinox.p2.reconciler.tests.platform.archive}${EOL}" |
888 | 801 | file="${executionDir}/equinoxp2tests.properties" |
889 | 802 | append="true" /> |
890 | | - <echo |
891 | | - message="org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive=${org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive}${EOL}" |
892 | | - file="${executionDir}/equinoxp2tests.properties" |
893 | | - append="true" /> |
894 | 803 | <echo |
895 | 804 | message="org.eclipse.equinox.p2.tests.current.build.repo=${current.build.repo}${EOL}" |
896 | 805 | file="${executionDir}/equinoxp2tests.properties" |
|
0 commit comments