From 789f2eb51ceafca6f39a57f1a989f8090cd8d15e Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Fri, 23 May 2025 11:44:46 -0500
Subject: [PATCH] Add initial tarball creation
---
.gitlab-ci.yml | 69 ++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 36 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a40717..a3c6518 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -136,39 +136,36 @@ build bundler:
when: on_success
- when: on_success
-
-#build tarball:
-# extends: .docker-base
-# image: "$CI_REGISTRY_IMAGE/ci-image:1.0.2"
-# stage: build tarball
-# before_script:
-# - df
-# # setup SSH key to upload to bumi
-# - eval $(ssh-agent -s)
-# - chmod 400 "$id_rsa_floods_upload"
-# - ssh-add "$id_rsa_floods_upload"
-# - mkdir -p ~/.ssh
-# - chmod 700 ~/.ssh
-# - cp "$SSH_KNOWN_HOSTS" ~/.ssh/known_hosts
-# - chmod 644 ~/.ssh/known_hosts
-# script:
-# - unset GIT_LFS_SKIP_SMUDGE
-# - git lfs pull --include "vendor/$CODE_TARBALL"
-# - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-# - IMAGE_TAG="$CI_REGISTRY_IMAGE/flood-bundler:${BUNDLER_TAG}"
-# # bumi gitlab runner has /data/tmp mounted as /work
-# - if [[ ! -d /work ]]; then OUT=${PWD}; else OUT=/work; fi
-# - VERSION=$(ci/get_bundle_version.sh)
-# - BUNDLE_NAME="cspp-geo-abi-flood-mapping-${VERSION}"
-# - podman run --rm -u $(id -u):$(id -g) -v ${PWD}/vendor:/vendor -v ${OUT}:/out -e TMPDIR=/out -w /out ${IMAGE_TAG} /work/bin/bundle.sh "${BUNDLE_NAME}"
-# # -O is needed otherwise scp might try to use sftp which won't match security checks on SSH key on bumi
-# - scp -O -v "${OUT}/${BUNDLE_NAME}.tar.gz" davidh@bumi.ssec.wisc.edu:/data/dist/floods/
-# rules:
-# - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-# when: never
-# - changes:
-# - geo_builder/bundle/*
-# when: on_success
-## - if: $BUILD_TARBALL
-## when: always
-# - when: on_success
+build tarball:
+ extends: .docker-base
+ image: "$CI_REGISTRY_IMAGE/ci-image:1.0.2"
+ stage: build tarball
+ before_script:
+ - !reference [.docker-base, before_script]
+ - df
+ # setup SSH key to upload to bumi
+ - eval $(ssh-agent -s)
+ - chmod 400 "$id_rsa_axitools_upload"
+ - ssh-add "$id_rsa_axitools_upload"
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+ - cp "$SSH_KNOWN_HOSTS" ~/.ssh/known_hosts
+ - chmod 644 ~/.ssh/known_hosts
+ script:
+ - IMAGE_TAG="$CI_REGISTRY_IMAGE/axitools-bundler:${BUNDLER_TAG}"
+ # bumi gitlab runner has /data/tmp mounted as /work
+ - if [[ ! -d /work ]]; then OUT=${PWD}; else OUT=/work; fi
+ - VERSION=$(ci/get_bundle_version.sh)
+ - BUNDLE_NAME="cspp-geo-axi-tools-${VERSION}"
+ - docker run --rm -u $(id -u):$(id -g) -v ${OUT}:/out -e TMPDIR=/out -w /out ${IMAGE_TAG} /work/bin/bundle.sh "${BUNDLE_NAME}"
+ # -O is needed otherwise scp might try to use sftp which won't match security checks on SSH key on bumi
+ - scp -O -v "${OUT}/${BUNDLE_NAME}.tar.gz" davidh@bumi.ssec.wisc.edu:/data/dist/axitools/
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+ when: never
+ - changes:
+ - docker/bundle/*
+ when: on_success
+# - if: $BUILD_TARBALL
+# when: always
+ - when: on_success
--
GitLab