Unverified Commit 3e10718c authored by acpaquette's avatar acpaquette Committed by GitHub
Browse files

ALE Related Jenkins Cleanup (#5039) 

* Fixed test failures related to ALE changes

* Updated tests truth data

* More test truth data updates

* Fixed phocube test and updated truth data for lrolola ingest

* Fixed more truth data

* Even more truth data updates

* Forced ISIS binaries to install into the conda environment

* Fixed tgo module tests

* Added safe guard around get spice call

* Updated params for spiceinit test

* Updated findfeatures test

* Updated msi2isis tests, again

* Updated lola test truth data
parent 30c9c778

Jenkinsfile

+1 −18
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ pipeline { 
        ISISDATA        =   '/astro_efs/isis_data'

        ISISTESTDATA    =   '/astro_efs/isis_testData'

        MALLOC_CHECK_   =   1

        PATH            =   "${env.WORKSPACE}/install/bin:${env.PATH}"

        ISISROOT        =   "${env.WORKSPACE}/build"

        KAKADU_HEADERS  =   '/astro_efs/kakadu_7_9'

    }
@@ -27,7 +26,6 @@ pipeline { 
                sh '''

                . /home/conda/mambaforge3/etc/profile.d/conda.sh > /dev/null

                echo "ISISROOT: ${ISISROOT}"

                echo "CURRENT PATH: ${PATH}"

                

                conda create -y -n isis

                conda activate isis > /dev/null
@@ -41,9 +39,6 @@ pipeline { 
            }

        }

        stage('Build') {

            environment {

                ISIS_INSTALL_DIR = "${env.WORKSPACE}/install"

            }

            steps {

                sh '''

                . /home/conda/mambaforge3/etc/profile.d/conda.sh > /dev/null
@@ -54,16 +49,13 @@ pipeline { 
                      -DKAKADU_INCLUDE_DIR=${KAKADU_HEADERS} \

                      -Dpybindings=OFF \

                      -DCMAKE_BUILD_TYPE=RELEASE \

                      -DCMAKE_INSTALL_PREFIX=${ISIS_INSTALL_DIR} \

                      -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \

                      ../isis

                ninja -j 8 install

                '''

            }

        }

        stage('GTests') {

            environment {

                PATH = "${env.WORKSPACE}/install/bin:${env.PATH}"

            }

            steps {

                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {

                    sh '''
@@ -76,9 +68,6 @@ pipeline { 
            }

        }

        stage('Unit Tests') {

            environment {

                PATH            =   "${env.WORKSPACE}/install/bin:${env.PATH}"

            }

            steps {

                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {

                    sh '''
@@ -91,9 +80,6 @@ pipeline { 
            }

        }

        stage('App Tests') {

            environment {

                PATH            =   "${env.WORKSPACE}/install/bin:${env.PATH}"

            }

            steps {

                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {

                    sh '''
@@ -106,9 +92,6 @@ pipeline { 
            }

        }

        stage('Module Tests') {

            environment {

                PATH            =   "${env.WORKSPACE}/install/bin:${env.PATH}"

            }

            steps {

                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {

                    sh '''

isis/src/base/objs/Spice/Spice.cpp

+10 −4
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ namespace Isis { 
          json props;

          props["kernels"] = kernel_pvl.str();



          isd = ale::load(lab.fileName().toStdString(), props.dump(), "ale");

          isd = ale::load(lab.fileName().toStdString(), props.dump(), "ale", false);

        }



        json aleNaifKeywords = isd["naif_keywords"];
@@ -350,7 +350,7 @@ namespace Isis { 
    else {

      // JAA - Modified to store and look for the frame body code in the cube labels

      SpiceInt frameCode;

      if ((m_usingNaif) && (!m_naifKeywords->hasKeyword("BODY_FRAME_CODE"))) {

      if (((m_usingNaif) || (!m_naifKeywords->hasKeyword("BODY_FRAME_CODE"))) && !isUsingAle()) {

        char frameName[32];

        SpiceBoolean found;

        cidfrm_c(*m_spkBodyCode, sizeof(frameName), &frameCode, frameName, &found);
@@ -369,8 +369,14 @@ namespace Isis { 
        storeValue("BODY_FRAME_CODE", 0, SpiceIntType, result);

      }

      else {

        try {

          frameCode = getInteger("BODY_FRAME_CODE", 0);

        }

        catch(IException &e) {

          QString msg = "Unable to read BODY_FRAME_CODE from naifkeywords group";

          throw IException(IException::Io, msg, _FILEINFO_);

        }

      }



      m_bodyRotation = new SpiceRotation(frameCode);

      *m_bodyFrameCode = frameCode;
@@ -701,7 +707,7 @@ namespace Isis { 
          cacheSize);

      if (cacheSize > 3) m_instrumentPosition->Memcache2HermiteCache(tol);

    }

    else if (m_instrumentPosition->GetSource() == SpicePosition::Memcache) {

    else if (m_instrumentPosition->GetSource() == SpicePosition::Memcache && m_instrumentPosition->HasVelocity() && isUsingAle()) {

      int aleCacheSize = m_instrumentPosition->cacheSize();

      if (aleCacheSize > 3) {

        m_instrumentPosition->Memcache2HermiteCache(tol);

isis/tests/FunctionalTestsCamdev.cpp

+3 −3
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ TEST_F(LineScannerCube, FunctionalTestCamdevDefault) { 
    stddev += oCubeStats->StandardDeviation();

  }



  EXPECT_NEAR(average/oCube.bandCount(), 9183553.1942929607, 0.0000001);

  EXPECT_NEAR(sum/oCube.bandCount(), 112847454091.56306, 0.0000001);

  EXPECT_NEAR(stddev/oCube.bandCount(), 11.299672545293422, 0.0000001);

	EXPECT_NEAR(average / oCube.bandCount(), 9183553.1942882799, 0.0000001);

	EXPECT_NEAR(sum/oCube.bandCount(), 112847454091.50554, 0.0000001);

  EXPECT_NEAR(stddev/oCube.bandCount(), 11.294379230915617, 0.0000001);

  EXPECT_NEAR(validPixels/oCube.bandCount(), 12064.188679245282, 0.0000001);

}

isis/tests/FunctionalTestsCaminfo.cpp

+7 −7
Original line number Diff line number Diff line
@@ -282,10 +282,10 @@ TEST_F(DefaultCube, FunctionalTestCaminfoDefault) { 
    EXPECT_NEAR(camstats.findKeyword("LocalRadiusMaximum"), 3413492.0662692, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("LocalRadiusAverage"), 3412205.8144925, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("LocalRadiusStandardDeviation"), 648.57630914361, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMinimum"), 312.29940658572, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMaximum"), 350.59781250682, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMinimum"), 312.35223008738, 0.001);

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMaximum"), 350.57900431316, 0.001);

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthAverage"), 332.96766151042, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthStandardDeviation"), 0.67383189468183, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthStandardDeviation"), 0.67037977027338, 0.001);



    EXPECT_TRUE(camobj.hasObject("IsisLabel"));

    EXPECT_TRUE(camobj.hasObject("Parameters"));
@@ -582,8 +582,8 @@ TEST_F(DefaultCube, FunctionalTestCaminfoCamStatsTable) { 
    EXPECT_NEAR(camstats.findKeyword("LocalRadiusAverage"), 3412223.5305052, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("LocalRadiusStandardDeviation"), 719.07504507167, 0.001 );



    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMinimum"), 331.7404023018, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMaximum"), 334.64077228603, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthAverage"), 332.98078370368, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthStandardDeviation"), 0.4900870906713, 0.001 );

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMinimum"), 331.73654530385, 0.001);

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthMaximum"), 334.60868272768, 0.001);

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthAverage"), 332.98305534536, 0.001);

    EXPECT_NEAR(camstats.findKeyword("NorthAzimuthStandardDeviation"), 0.4825660916106, 0.001);

}

isis/tests/FunctionalTestsCamrange.cpp

+14 −14
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ TEST_F(DefaultCube, FunctionalTestCamrangeMeta) { 
  EXPECT_EQ( (double) target.findKeyword("RadiusC"), 3376200.0 );



  PvlGroup pixelResolution = appLog.findGroup("PixelResolution");

  EXPECT_EQ( (double) pixelResolution.findKeyword("Lowest"), 18.986042964757 );

  EXPECT_EQ( (double) pixelResolution.findKeyword("Highest"), 18.840630601657 );

  EXPECT_EQ( (double) pixelResolution.findKeyword("Lowest"), 18.986043012971 );

  EXPECT_EQ( (double) pixelResolution.findKeyword("Highest"), 18.840630573799 );

}



TEST_F(DefaultCube, FunctionalTestCamrangeUniversalGround) {
@@ -44,10 +44,10 @@ TEST_F(DefaultCube, FunctionalTestCamrangeUniversalGround) { 
  EXPECT_PRED_FORMAT2( AssertQStringsEqual, universalGroundRange.findKeyword("LongitudeDirection"), "PositiveEast" );

  EXPECT_PRED_FORMAT2( AssertQStringsEqual, universalGroundRange.findKeyword("LongitudeDirection"), "PositiveEast" );

  EXPECT_EQ( (int) universalGroundRange.findKeyword("LongitudeDomain"), 360 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MinimumLatitude"), 9.9284293968724 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MaximumLatitude"), 10.434928853234 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MinimumLongitude"), 255.64532672113 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MaximumLongitude"), 256.14630113081 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MinimumLatitude"), 9.928429270844 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MaximumLatitude"), 10.434928979804 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MinimumLongitude"), 255.64532659875 );

  EXPECT_EQ( (double) universalGroundRange.findKeyword("MaximumLongitude"), 256.14630125881 );

}



TEST_F(DefaultCube, FunctionalTestCamrangeLatitude) {
@@ -59,8 +59,8 @@ TEST_F(DefaultCube, FunctionalTestCamrangeLatitude) { 


  PvlGroup latitudeRange = appLog.findGroup("LatitudeRange");

  EXPECT_PRED_FORMAT2( AssertQStringsEqual, latitudeRange.findKeyword("LatitudeType"), "Planetographic" );

  EXPECT_EQ( (double) latitudeRange.findKeyword("MinimumLatitude"), 10.043959780766 );

  EXPECT_EQ( (double) latitudeRange.findKeyword("MaximumLatitude"), 10.556092357488 );

  EXPECT_EQ( (double) latitudeRange.findKeyword("MinimumLatitude"), 10.043959653331 );

  EXPECT_EQ( (double) latitudeRange.findKeyword("MaximumLatitude"), 10.55609248546 );

}



TEST_F(DefaultCube, FunctionalTestCamrangeCardinals) {
@@ -73,20 +73,20 @@ TEST_F(DefaultCube, FunctionalTestCamrangeCardinals) { 
  PvlGroup positiveWest360 = appLog.findGroup("PositiveWest360");

  EXPECT_PRED_FORMAT2( AssertQStringsEqual, positiveWest360.findKeyword("LongitudeDirection"), "PositiveWest" );

  EXPECT_EQ( (int) positiveWest360.findKeyword("LongitudeDomain"), 360 );

  EXPECT_EQ( (double) positiveWest360.findKeyword("MinimumLongitude"), 103.85369886919 );

  EXPECT_EQ( (double) positiveWest360.findKeyword("MaximumLongitude"), 104.35467327887 );

  EXPECT_EQ( (double) positiveWest360.findKeyword("MinimumLongitude"), 103.85369874119 );

  EXPECT_EQ( (double) positiveWest360.findKeyword("MaximumLongitude"), 104.35467340125 );



  PvlGroup  positiveEast180 = appLog.findGroup("PositiveEast180");

  EXPECT_PRED_FORMAT2( AssertQStringsEqual, positiveEast180.findKeyword("LongitudeDirection"), "PositiveEast" );

  EXPECT_EQ( (int) positiveEast180.findKeyword("LongitudeDomain"), 180 );

  EXPECT_EQ( (double) positiveEast180.findKeyword("MinimumLongitude"), -104.35467327887 );

  EXPECT_EQ( (double) positiveEast180.findKeyword("MaximumLongitude"), -103.85369886919 );

  EXPECT_EQ( (double) positiveEast180.findKeyword("MinimumLongitude"), -104.35467340125 );

  EXPECT_EQ( (double) positiveEast180.findKeyword("MaximumLongitude"), -103.85369874119 );



  PvlGroup positiveWest180 = appLog.findGroup("PositiveWest180");

  EXPECT_PRED_FORMAT2( AssertQStringsEqual, positiveWest180.findKeyword("LongitudeDirection"), "PositiveWest" );

  EXPECT_EQ( (int) positiveWest180.findKeyword("LongitudeDomain"), 180 );

  EXPECT_EQ( (double) positiveWest180.findKeyword("MinimumLongitude"), 103.85369886919 );

  EXPECT_EQ( (double) positiveWest180.findKeyword("MaximumLongitude"), 104.35467327887 );

  EXPECT_EQ( (double) positiveWest180.findKeyword("MinimumLongitude"), 103.85369874119 );

  EXPECT_EQ( (double) positiveWest180.findKeyword("MaximumLongitude"), 104.35467340125 );

}



TEST_F(DefaultCube, FunctionalTestCamrangeWriteTo) {