Merge pull request #23 from lsst-ts/tickets/DM-27141

Fix Jenkinsfile.conda
lsst-ts · Oct 23, 2020 · e623ced · e623ced
2 parents d25eebd + 9111845
commit e623ced
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Jenkinsfile.conda b/Jenkinsfile.conda
@@ -2,7 +2,6 @@ pipeline {
     agent any
     environment {
         package_name = "rotator"
-        package_version = sh(returnStdout: true, script: "git describe --tags --always --dirty").trim()
         dockerImageName = "lsstts/conda_package_builder:latest"
         container_name = "salobj_${BUILD_ID}_${JENKINS_NODE_COOKIE}"
     }
@@ -33,11 +32,12 @@ pipeline {
             steps {
                 script {
                     sh """
-                    docker exec ${container_name} sh -c "git clone https://github.com/lsst-ts/ts_config_attcs.git"
+                    docker exec ${container_name} sh -c "git clone https://github.com/lsst-ts/ts_config_mttcs.git"
                     """
                 }
             }
-        }        stage("Create Rotator Conda package") {
+        }
+        stage("Create Rotator Conda package") {
             steps {
                 script {
                     sh """

diff --git a/doc/version_history.rst b/doc/version_history.rst
@@ -6,6 +6,22 @@
 Version History
 ###############
 
+v0.7.2
+======
+
+Changes:
+
+* Fix Jenkinsfile.conda.
+
+Requires:
+
+* ts_hexrotcomm 0.7
+* ts_salobj 5.11 or 6
+* ts_simactuators 1
+* ts_idl 1.4, or 2 with salobj 6
+* ts_xml 6.2
+* Rotator IDL files, e.g. made using ``make_idl_files.py Rotator``
+
 v0.7.1
 ======