Skip to content

Commit

Permalink
Update environment and create new groovy files (#39)
Browse files Browse the repository at this point in the history
* switch env vars to new form and create groovy files

* clean up groovy files
  • Loading branch information
Mike Fulton authored Sep 21, 2023
1 parent 1a6f22a commit c3854cb
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 6 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ tests/hw/hw
*.o
install/
log/
log.STABLE
12 changes: 6 additions & 6 deletions buildenv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# Set up environment variables for general build tool to operate
#
export ZOPEN_TYPE="TARBALL"
export ZOPEN_BUILD_LINE="STABLE"
MAKE_VERSION="4.4.1"

export ZOPEN_TARBALL_URL="https://ftp.gnu.org/gnu/make/make-$MAKE_VERSION.tar.gz"
export ZOPEN_TARBALL_DEPS="curl gzip tar m4 perl make zoslib"
export ZOPEN_STABLE_URL="https://ftp.gnu.org/gnu/make/make-$MAKE_VERSION.tar.gz"
export ZOPEN_STABLE_DEPS="curl gzip tar m4 perl make zoslib"

export ZOPEN_GIT_URL="https://git.savannah.gnu.org/git/make.git"
export ZOPEN_GIT_DEPS="git make m4 perl autoconf automake help2man texinfo xz"
export ZOPEN_DEV_URL="https://git.savannah.gnu.org/git/make.git"
export ZOPEN_DEV_DEPS="git make m4 perl autoconf automake help2man texinfo xz"
export ZOPEN_CHECK="check_make"
export ZOPEN_INSTALL="install_make"
export ZOPEN_COMP=CLANG
Expand Down Expand Up @@ -39,7 +39,7 @@ ZZ
fi

failures=$(grep ".* Test.*in .* Categor.*Failed" ${chk} | cut -f1 -d' ')
success=$(egrep "[0-9]+ passed" $chk | sed -e 's#.*[(/]\([0-9]\+\) passed)#\1#g' | awk '{s+=$1} END {print s}')
success=$(grep -E "[0-9]+ passed" $chk | sed -e 's#.*[(/]\([0-9]\+\) passed)#\1#g' | awk '{s+=$1} END {print s}')
totalTests=$((failures+success))

cat <<ZZ
Expand Down
29 changes: 29 additions & 0 deletions cicd-dev.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@

node('linux')
{
stage ('Poll') {
// Poll from upstream:
checkout([
$class: 'GitSCM',: 'GitSCM',
branches: [[name: '*/4.4.1']],
doGenerateSubmoduleConfigurations: false,
extensions: [],
userRemoteConfigs: [[url: 'https://git.savannah.gnu.org/git/make.git']]])

// Poll for local changes
checkout([
$class: 'GitSCM',
branches: [[name: '*/main']],
doGenerateSubmoduleConfigurations: false,
extensions: [],
userRemoteConfigs: [[url: 'https://github.com/ZOSOpenTools/makeport.git']]])
}

stage('Build') {
build job: 'Port-Pipeline', parameters: [
string(name: 'PORT_GITHUB_REPO', value: 'https://github.com/ZOSOpenTools/makeport.git'),
string(name: 'PORT_DESCRIPTION', value: 'GNU Make is a tool which controls the generation of executables and other non-source files of a program from program source files.'),
string(name: 'BUILD_LINE', value: 'DEV')]
}
}

21 changes: 21 additions & 0 deletions cicd-stable.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

node('linux')
{
stage ('Poll') {
// Poll for local changes
checkout([
$class: 'GitSCM',
branches: [[name: '*/main']],
doGenerateSubmoduleConfigurations: false,
extensions: [],
userRemoteConfigs: [[url: 'https://github.com/ZOSOpenTools/makeport.git']]])
}

stage('Build') {
build job: 'Port-Pipeline', parameters: [
string(name: 'PORT_GITHUB_REPO', value: 'https://github.com/ZOSOpenTools/makeport.git'),
string(name: 'PORT_DESCRIPTION', value: 'GNU Make is a tool which controls the generation of executables and other non-source files of a program from program source files.'),
string(name: 'BUILD_LINE', value: 'STABLE')]
}
}

0 comments on commit c3854cb

Please sign in to comment.