Change: split CI and release builds into separate projects

This is necessary because the APT sources.lists are different. We may
some day get powerful variable expansion that solves this.

1 files changed, 165 insertions, 120 deletions

diff --git a/ci-prod-programs.ick b/ci-prod-programs.ick
index afaa6c3..b485834 100644
--- a/ci-prod-programs.ick
+++ b/ci-prod-programs.ick
@@ -1,11 +1,15 @@
+# I build most of my projects on Debian stretch (current stable) and
+# unstable, both CI builds and releases. To avoid repetition, I define
+# four dummy projects: {CI,release} on {stretch,unstable}. The dummy
+# projects will never actually build.
+
 projects:
 
-# dummy-stretch is a project that I don't expect to ever build, and it
-# doesn't actually work. It's reason to exist is to have a convenient
-# place to define comon parameters and a list of pipelines, both of
-# which can be referred to in actual projects using YAML magic.
+# The base dummy project: CI builds for stretch. Other dummy projects
+# will build upon this. This defines the common parameters and
+# pipelines, which will be reused by "subclasses" via YAML magic.
 
-- project: dummy-stretch
+- project: dummy-ci-stretch
   parameters: &dummy_stretch_params
     DEBFULLNAME: Lars Wirzenius
     DEBEMAIL: liw@liw.fi
@@ -14,7 +18,8 @@ projects:
         dist: stretch-ci
         section: main
     systree_name: systrees-debian-stretch-build-essential
-    distribution: stretch-ci
+    distribution_ci: stretch-ci
+    distribution_rel: stretch
     notify: [liw@liw.fi]
     release_signing_keys:
       - |
@@ -187,7 +192,7 @@ projects:
         GSJSdir7NkZidgwoCPA7BTqsb5LN
         =dXB0
         -----END PGP PUBLIC KEY BLOCK-----
-  pipelines: &deb_build_pipelines
+  pipelines: &deb_ci_pipelines
     - ick/setup_container
     - ick/add_apt_signing_keys
     - ick/add_apt_sources
@@ -196,22 +201,55 @@ projects:
     - ick/build_deb_ci
     - ick/upload_debs
 
-# dummy-sid is like dummy-stretch, except for building for Debian
-# unstable (code name sid).
+# Dummy project to do CI builds on unstable (code name sid).
 
-- project: dummy-sid
+- project: dummy-ci-sid
   parameters: &dummy_sid_params
     <<: *dummy_stretch_params
     systree_name: systrees-debian-sid-build-essential
-    distribution: unstable-ci
-  pipelines: *deb_build_pipelines
+    distribution_ci: unstable-ci
+    distribution_rel: unstable
+    apt_sources:
+      - url: http://ci-prod-controller.vm.liw.fi/debian
+        dist: unstable-ci
+        section: main
+  pipelines: *deb_ci_pipelines
 
-# Real projects follow. Each project is duplicated with a stretch and
-# sid version.
+# Dummy project to do RELEASE builds on stretch.
 
+- project: dummy-release-stretch
+  parameters: &dummy_release_stretch_params
+    <<: *dummy_stretch_params
+    apt_sources:
+      - url: http://ci-prod-controller.vm.liw.fi/debian
+        dist: stretch
+        section: main
+  pipelines: &deb_release_pipelines
+    - ick/setup_container
+    - ick/add_apt_signing_keys
+    - ick/add_apt_sources
+    - ick/restore_workspace
+    - ick/get_sources
+    - ick/install_debian_build_dependencies
+    - ick/build_debian_release
+    - ick/archive_debian_release
+    - ick/save_workspace
+
+# Dummy project to do RELEASE builds on unstable.
+
+- project: dummy-release-unstable
+  parameters: &dummy_release_unstable_params
+    <<: *dummy_stretch_params
+    apt_sources:
+      - url: http://ci-prod-controller.vm.liw.fi/debian
+        dist: unstable
+        section: main
+  pipelines: *deb_release_pipelines
 
+# Real projects follow. Each project is duplicated with a stretch and
+# sid version, for CI, and for release.
 
-- project: coverage-test-runner-stretch
+- project: coverage-test-runner-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &coverage_test_runner_sources
@@ -219,17 +257,33 @@ projects:
         repo: git://git.liw.fi/coverage-test-runner
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: coverage-test-runner-sid
+- project: coverage-test-runner-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *coverage_test_runner_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
+
+- project: coverage-test-runner-release-stretch
+  parameters:
+    <<: *dummy_release_stretch_params
+    sources: *coverage_test_runner_sources
+    deb_artifact: debian-coverage-test-runner-stretch
+    workspace_name: workspace-coverage-test-runner-stretch
+  pipelines: *deb_release_pipelines
+
+- project: coverage-test-runner-release-sid
+  parameters:
+    <<: *dummy_release_unstable_params
+    sources: *coverage_test_runner_sources
+    deb_artifact: debian-coverage-test-runner-sid
+    workspace_name: workspace-coverage-test-runner-sid
+  pipelines: *deb_release_pipelines
 
 
 
-- project: cliapp-stretch
+- project: cliapp-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &cliapp_sources
@@ -237,59 +291,50 @@ projects:
         repo: git://git.liw.fi/cliapp
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: cliapp-sid
+- project: cliapp-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *cliapp_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
+- project: cliapp-release-stretch
+  parameters:
+    <<: *dummy_release_stretch_params
+    sources: *cliapp_sources
+    deb_artifact: debian-cliapp-stretch
+    workspace_name: workspace-cliapp-stretch
+  pipelines: *deb_release_pipelines
 
+- project: cliapp-release-sid
+  parameters:
+    <<: *dummy_release_unstable_params
+    sources: *cliapp_sources
+    deb_artifact: debian-cliapp-sid
+    workspace_name: workspace-cliapp-sid
+  pipelines: *deb_release_pipelines
 
-- project: cachedir-stretch
+
+
+- project: cachedir-ci-stretch
   parameters:
     <<: *dummy_stretch_params
-    apt_sources:
-      - url: http://ci-prod-controller.vm.liw.fi/debian
-        dist: stretch
-        section: main
     sources: &cachedir_sources
       - name: code
         repo: git://git.liw.fi/cachedir
         ref: master
         location: src
-    deb_artifact: debian-cachedir-stretch
-    workspace_name: workspace-cachedir-stretch
-    distribution: stretch
-  pipelines: &cachedir_pipelines
-    - ick/setup_container
-    - ick/add_apt_signing_keys
-    - ick/add_apt_sources
-    - ick/restore_workspace
-    - ick/get_sources
-    - ick/install_debian_build_dependencies
-    - ick/build_deb_ci
-    - ick/upload_debs
-    - ick/build_debian_release
-    - ick/archive_debian_release
-    - ick/save_workspace
+  pipelines: *deb_ci_pipelines
 
-- project: cachedir-sid
+- project: cachedir-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *cachedir_sources
-    apt_sources:
-      - url: http://ci-prod-controller.vm.liw.fi/debian
-        dist: unstable
-        section: main
-    deb_artifact: debian-cachedir-sid
-    workspace_name: workspace-cachedir-sid
-    distribution: unstable
-  pipelines: *cachedir_pipelines
+  pipelines: *deb_ci_pipelines
 
 
-- project: bumper-stretch
+- project: bumper-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &bumper_sources
@@ -297,17 +342,17 @@ projects:
         repo: git://git.liw.fi/bumper
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: bumper-sid
+- project: bumper-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *bumper_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: clab-stretch
+- project: clab-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &clab_sources
@@ -315,17 +360,17 @@ projects:
         repo: git://git.liw.fi/clab
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: clab-sid
+- project: clab-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *clab_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: ttystatus-stretch
+- project: ttystatus-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &ttystatus_sources
@@ -333,18 +378,18 @@ projects:
         repo: git://git.liw.fi/ttystatus
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 # commented out while pylint3 is uninstallable in sid
 # - project: ttystatus-sid
 #   parameters:
 #     <<: *dummy_sid_params
 #     sources: *ttystatus_sources
-#   pipelines: *deb_build_pipelines
+#   pipelines: *deb_ci_pipelines
 
 
 
-- project: copyright-statement-lint-stretch
+- project: copyright-statement-lint-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &copyright_statement_lint_sources
@@ -352,17 +397,17 @@ projects:
         repo: git://git.liw.fi/copyright-statement-lint
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: copyright-statement-lint-sid
+- project: copyright-statement-lint-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *copyright_statement_lint_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: py_pgpwordlist-stretch
+- project: py_pgpwordlist-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &py_pgpwordlist_sources
@@ -370,17 +415,17 @@ projects:
         repo: git://git.liw.fi/py_pgpwordlist
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: py_pgpwordlist-sid
+- project: py_pgpwordlist-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *py_pgpwordlist_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: distix-stretch
+- project: distix-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &distix_sources
@@ -388,17 +433,17 @@ projects:
         repo: git://git.liw.fi/distix
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: distix-sid
+- project: distix-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *distix_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: extrautils-stretch
+- project: extrautils-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &extrautils_sources
@@ -406,17 +451,17 @@ projects:
         repo: git://git.liw.fi/extrautils
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: extrautils-sid
+- project: extrautils-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *extrautils_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: cmdtest-stretch
+- project: cmdtest-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &cmdtest_sources
@@ -424,17 +469,17 @@ projects:
         repo: git://git.liw.fi/cmdtest
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: cmdtest-sid
+- project: cmdtest-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *cmdtest_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: genbackupdata-stretch
+- project: genbackupdata-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &genbackupdata_sources
@@ -442,17 +487,17 @@ projects:
         repo: git://git.liw.fi/genbackupdata
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: genbackupdata-sid
+- project: genbackupdata-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *genbackupdata_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: jt-stretch
+- project: jt-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &jt_sources
@@ -460,17 +505,17 @@ projects:
         repo: git://git.liw.fi/jt
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: jt-sid
+- project: jt-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *jt_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: dupfiles-stretch
+- project: dupfiles-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &dupfiles_sources
@@ -478,17 +523,17 @@ projects:
         repo: git://git.liw.fi/dupfiles
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: dupfiles-sid
+- project: dupfiles-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *dupfiles_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: liw-automation-stretch
+- project: liw-automation-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &liw_automation_sources
@@ -496,17 +541,17 @@ projects:
         repo: git://git.liw.fi/liw-automation
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: liw-automation-sid
+- project: liw-automation-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *liw_automation_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: summain-stretch
+- project: summain-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &summain_sources
@@ -514,17 +559,17 @@ projects:
         repo: git://git.liw.fi/summain
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: summain-sid
+- project: summain-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *summain_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: apifw-stretch
+- project: apifw-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &apifw_sources
@@ -532,17 +577,17 @@ projects:
         repo: git://git.liw.fi/apifw
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: apifw-sid
+- project: apifw-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *apifw_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: slog-stretch
+- project: slog-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &slog_sources
@@ -550,17 +595,17 @@ projects:
         repo: git://git.liw.fi/slog
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: slog-sid
+- project: slog-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *slog_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: ick2-stretch
+- project: ick2-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &ick2_sources
@@ -568,19 +613,19 @@ projects:
         repo: git://git.liw.fi/ick2
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: ick2-sid
+- project: ick2-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *ick2_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
 # No vmdb2 stretch build. It doesn't build there.
 
-- project: vmdb2-sid
+- project: vmdb2-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources:
@@ -588,11 +633,11 @@ projects:
         repo: git://git.liw.fi/vmdb2
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
 
 
-- project: ql-ikiwiki-publish-stretch
+- project: ql-ikiwiki-publish-ci-stretch
   parameters:
     <<: *dummy_stretch_params
     sources: &ql_ikiwiki_publish_sources
@@ -600,10 +645,10 @@ projects:
         repo: git://git.qvarnlabs.net/ql-ikiwiki-publish
         ref: master
         location: src
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines
 
-- project: ql-ikiwiki-publish-sid
+- project: ql-ikiwiki-publish-ci-sid
   parameters:
     <<: *dummy_sid_params
     sources: *ql_ikiwiki_publish_sources
-  pipelines: *deb_build_pipelines
+  pipelines: *deb_ci_pipelines