Update smoke test distributions

2025-11-04 02:35:48 +00:00 · 2022-01-10 13:23:18 -08:00
parent d23d37fcfd
commit a9ee802240
5 changed files with 154 additions and 75 deletions
--- a/Builds/containers/gitlab-ci/pkgbuild.yml
+++ b/Builds/containers/gitlab-ci/pkgbuild.yml
@@ -9,7 +9,7 @@
 # can be overridden by project or group variables as needed.
 variables:
  # these containers are built manually using the rippled
-  # cmake build (container targets) and tagged/pushed so they 
+  # cmake build (container targets) and tagged/pushed so they
  # can be used here
  RPM_CONTAINER_TAG: "2020-02-10"
  RPM_CONTAINER_NAME: "rippled-rpm-builder"
@@ -184,44 +184,36 @@ centos_7_smoketest:
    name: artifactory.ops.ripple.com/centos:7
  <<: *run_local_smoketest

-fedora_29_smoketest:
+# TODO: Remove "allow_failure" when tests fixed
+rocky_8_smoketest:
  stage: smoketest
  dependencies:
    - rpm_build
    - rpm_sign
  image:
-    name: artifactory.ops.ripple.com/fedora:29
+    name: rockylinux/rockylinux:8
  <<: *run_local_smoketest
+  allow_failure: true

-fedora_28_smoketest:
+fedora_34_smoketest:
  stage: smoketest
  dependencies:
    - rpm_build
    - rpm_sign
  image:
-    name: artifactory.ops.ripple.com/fedora:28
+    name: artifactory.ops.ripple.com/fedora:34
  <<: *run_local_smoketest
+  allow_failure: true

-fedora_27_smoketest:
+fedora_35_smoketest:
  stage: smoketest
  dependencies:
    - rpm_build
    - rpm_sign
  image:
-    name: artifactory.ops.ripple.com/fedora:27
-  <<: *run_local_smoketest
-
-## this one is not LTS, but we
-## get some extra coverage by including it
-## consider dropping it when 20.04 is ready
-ubuntu_20_smoketest:
-  stage: smoketest
-  dependencies:
-    - dpkg_build
-    - dpkg_sign
-  image:
-    name: artifactory.ops.ripple.com/ubuntu:20.04
+    name: artifactory.ops.ripple.com/fedora:35
  <<: *run_local_smoketest
+  allow_failure: true

 ubuntu_18_smoketest:
  stage: smoketest
@@ -232,15 +224,26 @@ ubuntu_18_smoketest:
    name: artifactory.ops.ripple.com/ubuntu:18.04
  <<: *run_local_smoketest

-ubuntu_16_smoketest:
+ubuntu_20_smoketest:
  stage: smoketest
  dependencies:
    - dpkg_build
    - dpkg_sign
  image:
-    name: artifactory.ops.ripple.com/ubuntu:16.04
+    name: artifactory.ops.ripple.com/ubuntu:20.04
  <<: *run_local_smoketest

+# TODO: remove "allow_failure" when 22.04 released in 4/2022...
+ubuntu_22_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+    - dpkg_sign
+  image:
+    name: artifactory.ops.ripple.com/ubuntu:22.04
+  <<: *run_local_smoketest
+  allow_failure: true
+
 debian_9_smoketest:
  stage: smoketest
  dependencies:
@@ -250,6 +253,24 @@ debian_9_smoketest:
    name: artifactory.ops.ripple.com/debian:9
  <<: *run_local_smoketest

+debian_10_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+    - dpkg_sign
+  image:
+    name: artifactory.ops.ripple.com/debian:10
+  <<: *run_local_smoketest
+
+debian_11_smoketest:
+  stage: smoketest
+  dependencies:
+    - dpkg_build
+    - dpkg_sign
+  image:
+    name: artifactory.ops.ripple.com/debian:11
+  <<: *run_local_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: verify_sig                                                  ##
@@ -346,38 +367,53 @@ centos_7_verify_repo_test:
  <<: *only_primary
  <<: *run_repo_smoketest

-fedora_29_verify_repo_test:
+rocky_8_verify_repo_test:
  stage: verify_from_test
  variables:
    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:29
+    name: rockylinux/rockylinux:8
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_28_verify_repo_test:
+fedora_34_verify_repo_test:
  stage: verify_from_test
  variables:
    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:28
+    name: artifactory.ops.ripple.com/fedora:34
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_27_verify_repo_test:
+fedora_35_verify_repo_test:
  stage: verify_from_test
  variables:
    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:27
+    name: artifactory.ops.ripple.com/fedora:35
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true
+
+ubuntu_18_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "bionic"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/ubuntu:18.04
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest

 ubuntu_20_verify_repo_test:
  stage: verify_from_test
@@ -391,29 +427,19 @@ ubuntu_20_verify_repo_test:
  <<: *only_primary
  <<: *run_repo_smoketest

-ubuntu_18_verify_repo_test:
+# TODO: remove "allow_failure" when 22.04 released in 4/2022...
+ubuntu_22_verify_repo_test:
  stage: verify_from_test
  variables:
-    DISTRO: "bionic"
+    DISTRO: "jammy"
    DEB_REPO: "rippled-deb-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/ubuntu:18.04
-  dependencies:
-    - dpkg_sign
-  <<: *only_primary
-  <<: *run_repo_smoketest
-
-ubuntu_16_verify_repo_test:
-  stage: verify_from_test
-  variables:
-    DISTRO: "xenial"
-    DEB_REPO: "rippled-deb-test-mirror"
-  image:
-    name: artifactory.ops.ripple.com/ubuntu:16.04
+    name: artifactory.ops.ripple.com/ubuntu:22.04
  dependencies:
    - dpkg_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

 debian_9_verify_repo_test:
  stage: verify_from_test
@@ -427,6 +453,30 @@ debian_9_verify_repo_test:
  <<: *only_primary
  <<: *run_repo_smoketest

+debian_10_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "buster"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/debian:10
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+debian_11_verify_repo_test:
+  stage: verify_from_test
+  variables:
+    DISTRO: "bullseye"
+    DEB_REPO: "rippled-deb-test-mirror"
+  image:
+    name: artifactory.ops.ripple.com/debian:11
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: wait_approval_prod                                          ##
@@ -492,38 +542,53 @@ centos_7_verify_repo_prod:
  <<: *only_primary
  <<: *run_repo_smoketest

-fedora_29_verify_repo_prod:
-  stage: verify_from_prod
+rocky_8_verify_repo_test:
+  stage: verify_from_test
  variables:
-    RPM_REPO: "rippled-rpm"
+    RPM_REPO: "rippled-rpm-test-mirror"
  image:
-    name: artifactory.ops.ripple.com/fedora:29
+    name: rockylinux/rockylinux:8
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_28_verify_repo_prod:
+fedora_34_verify_repo_prod:
  stage: verify_from_prod
  variables:
    RPM_REPO: "rippled-rpm"
  image:
-    name: artifactory.ops.ripple.com/fedora:28
+    name: artifactory.ops.ripple.com/fedora:34
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

-fedora_27_verify_repo_prod:
+fedora_35_verify_repo_prod:
  stage: verify_from_prod
  variables:
    RPM_REPO: "rippled-rpm"
  image:
-    name: artifactory.ops.ripple.com/fedora:27
+    name: artifactory.ops.ripple.com/fedora:35
  dependencies:
    - rpm_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true
+
+ubuntu_18_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "bionic"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/ubuntu:18.04
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest

 ubuntu_20_verify_repo_prod:
  stage: verify_from_prod
@@ -537,29 +602,19 @@ ubuntu_20_verify_repo_prod:
  <<: *only_primary
  <<: *run_repo_smoketest

-ubuntu_18_verify_repo_prod:
+# TODO: remove "allow_failure" when 22.04 released in 4/2022...
+ubuntu_22_verify_repo_prod:
  stage: verify_from_prod
  variables:
-    DISTRO: "bionic"
+    DISTRO: "jammy"
    DEB_REPO: "rippled-deb"
  image:
-    name: artifactory.ops.ripple.com/ubuntu:18.04
-  dependencies:
-    - dpkg_sign
-  <<: *only_primary
-  <<: *run_repo_smoketest
-
-ubuntu_16_verify_repo_prod:
-  stage: verify_from_prod
-  variables:
-    DISTRO: "xenial"
-    DEB_REPO: "rippled-deb"
-  image:
-    name: artifactory.ops.ripple.com/ubuntu:16.04
+    name: artifactory.ops.ripple.com/ubuntu:22.04
  dependencies:
    - dpkg_sign
  <<: *only_primary
  <<: *run_repo_smoketest
+  allow_failure: true

 debian_9_verify_repo_prod:
  stage: verify_from_prod
@@ -573,6 +628,30 @@ debian_9_verify_repo_prod:
  <<: *only_primary
  <<: *run_repo_smoketest

+debian_10_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "buster"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/debian:10
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
+debian_11_verify_repo_prod:
+  stage: verify_from_prod
+  variables:
+    DISTRO: "bullseye"
+    DEB_REPO: "rippled-deb"
+  image:
+    name: artifactory.ops.ripple.com/debian:11
+  dependencies:
+    - dpkg_sign
+  <<: *only_primary
+  <<: *run_repo_smoketest
+
 #########################################################################
 ##                                                                     ##
 ##  stage: get_final_hashes                                            ##
@@ -622,5 +701,3 @@ build_ubuntu_container:
  script:
    - . ./Builds/containers/gitlab-ci/build_container.sh dpkg
  allow_failure: true
-
-
--- a/Builds/containers/gitlab-ci/push_to_artifactory.sh
+++ b/Builds/containers/gitlab-ci/push_to_artifactory.sh
@@ -19,7 +19,7 @@ RIPPLED_DBG_PKG=$(ls rippled-dbgsym_*.deb)
 # TODO - where to upload src tgz?
 RIPPLED_SRC=$(ls rippled_*.orig.tar.gz)
 DEB_MATRIX=";deb.component=${COMPONENT};deb.architecture=amd64"
-for dist in stretch buster xenial bionic disco focal ; do
+for dist in stretch buster bullseye bionic focal jammy; do
    DEB_MATRIX="${DEB_MATRIX};deb.distribution=${dist}"
 done
 echo "{ \"debs\": {" > "${TOPDIR}/files.info"
@@ -88,4 +88,3 @@ JSON
 )
    curl ${SLACK_NOTIFY_URL} --data-urlencode "${CONTENT}"
 fi
-
--- a/Builds/containers/gitlab-ci/smoketest.sh
+++ b/Builds/containers/gitlab-ci/smoketest.sh
@@ -16,7 +16,7 @@ case ${ID} in
    ubuntu|debian)
        pkgtype="dpkg"
        ;;
-    fedora|centos|rhel|scientific)
+    fedora|centos|rhel|scientific|rocky)
        pkgtype="rpm"
        ;;
    *)
@@ -76,7 +76,12 @@ else
        yum -y install ${rpm_version_release}
    elif [ "${install_from}" = "local" ] ; then
        # cached pkg install
-        yum install -y yum-utils openssl-static zlib-static
+        pkgs=("yum-utils openssl-static zlib-static")
+        if [ "$ID" = "rocky" ]; then
+            sed -i 's/enabled=0/enabled=1/g' /etc/yum.repos.d/Rocky-PowerTools.repo
+            pkgs="${pkgs[@]/openssl-static}"
+        fi
+        yum install -y $pkgs
        rm -f build/rpm/packages/rippled-debug*.rpm
        rm -f build/rpm/packages/*.src.rpm
        rpm -i build/rpm/packages/*.rpm
@@ -95,5 +100,3 @@ fi
 # run unit tests
 /opt/ripple/bin/rippled --unittest --unittest-jobs $(nproc)
 /opt/ripple/bin/validator-keys --unittest
-
-
--- a/Builds/containers/packaging/dpkg/debian/control
+++ b/Builds/containers/packaging/dpkg/debian/control
@@ -17,5 +17,5 @@ Section: devel
 Recommends: rippled (= ${binary:Version})
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}, libprotobuf-dev, libssl-dev
+Depends: ${misc:Depends}, ${shlibs:Depends}, libprotobuf-dev
 Description: development files for applications using xrpl core library (serialize + sign)
--- a/Builds/containers/packaging/rpm/rippled.spec
+++ b/Builds/containers/packaging/rpm/rippled.spec
@@ -20,7 +20,7 @@ rippled
 %package devel
 Summary: Files for development of applications using xrpl core library
 Group: Development/Libraries
-Requires: openssl-static, zlib-static
+Requires: zlib-static

 %description devel
 core library for development of standalone applications that sign transactions.