[Git][NTPsec/ntpsec][master] Consolidate FreeBSD CI targets

[Richard Laager (@rlaager)]

Richard Laager pushed to branch master at NTPsec / ntpsec


Commits:
26d21969 by Matt Selsky at 2022-05-12T13:25:12-04:00
Consolidate FreeBSD CI targets

This makes it easier to track the stable released version of FreeBSD

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab-opttest-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -211,29 +211,7 @@ ubuntu-rolling-refclocks:
   script:
     - python3 ./waf configure --disable-doc --disable-manpage --refclock=all build
 
-freebsd-11-basic:
-  <<: *job_definition
-  script:
-    - python ./waf configure --disable-doc --disable-manpage --disable-nts build
-    - DESTDIR=build/prison python ./waf install
-    - DESTDIR=./prison python ./waf install
-    - DESTDIR=../prison python ./waf install
-    - rm -rvf build/prison ./prison ../prison
-  tags:
-    - freebsd-11
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
-freebsd-11-refclocks:
-  <<: *job_definition
-  script:
-    - python ./waf configure --disable-doc --disable-manpage --disable-nts --refclock=all build
-  tags:
-    - freebsd-11
-  rules:
-    - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-
-freebsd-12-basic:
+freebsd-basic:
   <<: *job_definition
   script:
     - python ./waf configure --disable-doc --disable-manpage build
@@ -242,16 +220,16 @@ freebsd-12-basic:
     - DESTDIR=../prison python ./waf install
     - rm -rvf build/prison ./prison ../prison
   tags:
-    - freebsd-12
+    - freebsd
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
-freebsd-12-refclocks:
+freebsd-refclocks:
   <<: *job_definition
   script:
     - python ./waf configure --disable-doc --disable-manpage --refclock=all build
   tags:
-    - freebsd-12
+    - freebsd
   rules:
     - if: '$CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 


=====================================
.gitlab-opttest-ci.yml
=====================================
@@ -67,27 +67,14 @@ macos-options-tester:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
 
-fbsd-11-options-tester:
+freebsd-options-tester:
   stage: test
   needs: []
   script:
     - PYTHON=python2.7 tests/option-tester.sh
     - PYTHON=python3 tests/option-tester.sh
   tags:
-    - freebsd-11
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
-      when: never
-    - when: never
-
-fbsd-12-options-tester:
-  stage: test
-  needs: []
-  script:
-    - PYTHON=python2.7 tests/option-tester.sh
-    - PYTHON=python3 tests/option-tester.sh
-  tags:
-    - freebsd-11
+    - freebsd
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_BRANCH && $CI_PROJECT_PATH == "NTPsec/ntpsec"'
       when: never



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/26d21969da41a33fd496819701384e41f7340c81

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/commit/26d21969da41a33fd496819701384e41f7340c81
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20220512/b34d4a19/attachment-0001.htm>