From 0577191398060e51a5c9b9080a95ddc681c0e079 Mon Sep 17 00:00:00 2001 From: Frank Scheiner Date: Fri, 21 Oct 2022 15:43:53 +0200 Subject: [PATCH 1/4] Switchover to new source repo --- travis-ci/upload_source_tarballs.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/travis-ci/upload_source_tarballs.sh b/travis-ci/upload_source_tarballs.sh index eb47cb928..59c6d3df4 100755 --- a/travis-ci/upload_source_tarballs.sh +++ b/travis-ci/upload_source_tarballs.sh @@ -7,12 +7,11 @@ set -eux repo_owner=$1 -# also hosts repo.gridcf.org; can't use repo.gridcf.org directly because -# CloudFlare apparently doesn't properly handle SSH -upload_server=hcc-osg-repo.unl.edu +# hosts repo.gridcf.org +upload_server="repo-gridcf.redir.ops.egi.eu" -# obtained by running "ssh-keyscan hcc-osg-repo.unl.edu" -hostsig="hcc-osg-repo.unl.edu ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2AIWAVx2KY+GhDab9SdxLTvjjzTiNa4pfHe7TvRZ5O+qZNc4c8sBlsG7OZGZvDLMRjGTKFyjJx3jDVUwaf14DwzQi9rgZxEZgBsRFffLATZqz+DyVN1H9uw215pah9Wh6yzaqMn51y6kqg0kk/ip62cYcXFgLKUNkzV0yz5WFugm5ziROZn01v5o74VdCABTAdlZhviUoObCn+bycXoUGGETY5GZ3muAW6y5LydDTD+2S97qJWGdSW7JBIfcmU7n5dl8MrtYKYwGswOgdUDrLtCp6CdZt/Evr+3NyLp35IhLnwxdkBBlKHPY0jXrGHyemsXa0Hq0PG/Ih5d0M8RMp" +# obtained by running "repo-gridcf.redir.ops.egi.eu" +hostsig="repo-gridcf.redir.ops.egi.eu ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4jPJDFLpljf6pSai/W2yh1/bgvRkfpLf9vvHs6ETYb" echo "$hostsig" > ~/.ssh/known_hosts From f1e91513d6bc4885fcb5b41e927eaa2f4f9b8596 Mon Sep 17 00:00:00 2001 From: Frank Scheiner Date: Fri, 21 Oct 2022 15:44:53 +0200 Subject: [PATCH 2/4] Change to Ubuntu Focal (20.04) as build environment on Travis Ci, cleanup configuration and enable builds on arm64, too. --- .travis.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8fb28c42d..f2443fb30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,21 +5,29 @@ # Also, the following gram tests failed for all fedora versions: # nonblocking-register-test.pl, register-callback-test.pl, register-test.pl -arch: +os: linux +dist: focal +language: ruby +# As per [1] explicitly included builds inherit the first value in an array. +# [1]: https://docs.travis-ci.com/user/multi-cpu-architectures#example-multi-architecture-build-matrix +# Hence the desired arch needs to be specified for each job additionally +# below. +#arch: # Disabled for now #- amd64 # Handled via partner queue, uncharged - - ppc64le + #- ppc64le #- arm64 jobs: include: - &run_tests # Template; subsequent uses modify 'env' + arch: + - ppc64le env: - IMAGE=centos:centos7 TASK=tests COMPONENTS=udt,myproxy,ssh stage: test - sudo: required services: - docker @@ -30,6 +38,19 @@ jobs: script: - travis-ci/setup_tasks.sh + + - <<: *run_tests + arch: + - arm64 + + - <<: *run_tests + arch: + - ppc64le + env: + - IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5 + - <<: *run_tests + arch: + - arm64 env: - IMAGE=centos:centos7 TASK=tests COMPONENTS=gram5 From 99a7eaa78a7ab7aae5b744330b80e1da5b84ffb4 Mon Sep 17 00:00:00 2001 From: Frank Scheiner Date: Fri, 21 Oct 2022 15:53:49 +0200 Subject: [PATCH 3/4] Add Rocky Linux 9 as build target and update secret name --- .github/workflows/build-test-deploy.yml | 14 +++++++++++--- travis-ci/run_task_inside_docker.sh | 9 ++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index ba7cfd8f9..f0dcaaa60 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -22,6 +22,10 @@ jobs: components: 'myproxy,ssh' - image: 'quay.io/centos/centos:stream9' components: 'gram5' + - image: 'rockylinux:9' + components: 'myproxy,ssh' + - image: 'rockylinux:9' + components: 'gram5' steps: - uses: actions/checkout@v2 with: @@ -35,7 +39,8 @@ jobs: run: travis-ci/setup_tasks.sh - name: build source tarballs and srpms - # Only run this step for the centos:centos7 case and for only one component selection + # Only run this step for the centos:centos7 case and for only one component selection, + # it still builds **all** source tarballs and SRPMs if: | contains(matrix.image , 'centos:centos7') && contains(matrix.components , 'udt,myproxy,ssh') @@ -46,9 +51,12 @@ jobs: # SSH key recipe from https://www.webfactory.de/blog/use-ssh-key-for-private-repositories-in-github-actions - name: Establish ssh and upload source tarballs - # Only run this step for the centos:centos7 case + # Only run this step for the centos:centos7 case and + # for only one component selection and + # only when a tag was created if: | contains(matrix.image , 'centos:centos7') && + contains(matrix.components , 'udt,myproxy,ssh') && contains(github.ref , 'refs/tags/') env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock @@ -56,5 +64,5 @@ jobs: mkdir -p ~/.ssh ssh-keyscan github.com >> ~/.ssh/known_hosts ssh-agent -a "$SSH_AUTH_SOCK" > /dev/null - ssh-add - <<< "${{ secrets.ID_GCTUPLOADER }}" + ssh-add - <<< "${{ secrets.ID_GRIDCF_UPLOADER }}" travis-ci/upload_source_tarballs.sh ${{ github.repository_owner }} diff --git a/travis-ci/run_task_inside_docker.sh b/travis-ci/run_task_inside_docker.sh index a11b02fc4..a47dbf659 100755 --- a/travis-ci/run_task_inside_docker.sh +++ b/travis-ci/run_task_inside_docker.sh @@ -13,6 +13,7 @@ case $( Date: Tue, 25 Oct 2022 12:49:58 +0200 Subject: [PATCH 4/4] Build source tarballs and SRPMs for all OS cases --- .github/workflows/build-test-deploy.yml | 13 ++-- travis-ci/make_rpms.sh | 19 +++++- travis-ci/make_source_tarballs.sh | 9 +++ travis-ci/run_task_inside_docker.sh | 90 ++++++++++++++++++------- 4 files changed, 98 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index f0dcaaa60..cef044c30 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -13,6 +13,8 @@ jobs: run-scripts: runs-on: ubuntu-latest strategy: + # Don't cancel the remaining running jobs if some job(s) fail(s) + fail-fast: false matrix: image: ['centos:centos7', 'rockylinux:8', 'quay.io/centos/centos:stream8'] components: ['udt,myproxy,ssh', 'gram5'] @@ -39,24 +41,23 @@ jobs: run: travis-ci/setup_tasks.sh - name: build source tarballs and srpms - # Only run this step for the centos:centos7 case and for only one component selection, + # Run this step for all OS cases but for only one component selection each, # it still builds **all** source tarballs and SRPMs if: | - contains(matrix.image , 'centos:centos7') && - contains(matrix.components , 'udt,myproxy,ssh') + contains(matrix.components , 'gram5') env: - IMAGE: centos:centos7 + IMAGE: ${{ matrix.image }} TASK: srpms run: travis-ci/setup_tasks.sh # SSH key recipe from https://www.webfactory.de/blog/use-ssh-key-for-private-repositories-in-github-actions - name: Establish ssh and upload source tarballs # Only run this step for the centos:centos7 case and - # for only one component selection and + # for only one component selection (must be the same as for the previous step!) and # only when a tag was created if: | contains(matrix.image , 'centos:centos7') && - contains(matrix.components , 'udt,myproxy,ssh') && + contains(matrix.components , 'gram5') && contains(github.ref , 'refs/tags/') env: SSH_AUTH_SOCK: /tmp/ssh_agent.sock diff --git a/travis-ci/make_rpms.sh b/travis-ci/make_rpms.sh index cb4aa3e29..7086e489d 100755 --- a/travis-ci/make_rpms.sh +++ b/travis-ci/make_rpms.sh @@ -16,6 +16,14 @@ usage() umask 022 +case $(> "$topdir/.rpmmacros" %_excludedocs 0 EOF +# Limit package list according to OS possibilities +all_packages=( $(grep -v '^#' $fedoradir/ORDERING | grep '[^[:space:]]') ) -packages=( $(grep -v '^#' $fedoradir/ORDERING | grep '[^[:space:]]') ) +if [[ $OS != *9 ]]; then + + packages=( ${all_packages[@]} ) +else + # Not building globus-xio-udt-driver on *9 + packages_9=( ${all_packages[@]/globus-xio-udt-driver/} ) + packages=( ${packages_9[@]} ) +fi cp -f "$tarballdir"/*.tar.gz "$topdir"/SOURCES diff --git a/travis-ci/make_source_tarballs.sh b/travis-ci/make_source_tarballs.sh index ba6bcb1ec..b689ba173 100755 --- a/travis-ci/make_source_tarballs.sh +++ b/travis-ci/make_source_tarballs.sh @@ -10,6 +10,15 @@ set -eu +case $(