Develop->Master

.github/workflows/basic_sdk_functionality_tests.yml

@@ -0,0 +1,174 @@
+name: Basic kb-sdk functionality tests
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+      - master
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - closed
+
+jobs:
+  test_kb-sdk_builds:
+    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-latest]
+        language: [perl, python, java]
+        test_type: [base] #, example]
+        auth: [token, env_var]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      # build kb-sdk from source and test basic functions
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8.0.362+9
+
+      - name: Build with Ant
+        run: |
+          make
+
+      - name: Add bin to $PATH
+        run: |
+          echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
+
+      - name: checking kb-sdk functions
+        env:
+          KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+          LANGUAGE_TOKEN: ${{ matrix.language }}
+        run: |
+          env
+          kb-sdk help
+          kb-sdk version
+
+      # the following steps create a KBase app using the SDK
+      # and runs some checks to ensure the app generated
+      # is functional and that the SDK can test it.
+      - name: init base repo
+        if: matrix.test_type == 'base'
+        env:
+          LANGUAGE_TOKEN: ${{ matrix.language }}
+        run: |
+          kb-sdk init -l $LANGUAGE_TOKEN -u user SampleApp
+
+      - name: init example repo
+        if: matrix.test_type == 'example'
+        env:
+          LANGUAGE_TOKEN: ${{ matrix.language }}
+        run: |
+          kb-sdk init -l $LANGUAGE_TOKEN -u user --example SampleApp
+
+      - name: test ${{ matrix.test_type }} repo, using test.cfg for auth
+        if: matrix.auth == 'token'
+        run: |
+          cd SampleApp
+          kb-sdk test || true
+
+      - name: test ${{ matrix.test_type }} repo, using test.cfg for auth, add env var to test.cfg
+        if: matrix.auth == 'token'
+        env:
+          KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+        run: |
+          cd SampleApp
+          sed -i "s/test_token=/test_token=$KBASE_TEST_TOKEN/" test_local/test.cfg
+          kb-sdk test
+
+      - name: test ${{ matrix.test_type }} repo, using env var for auth
+        if: matrix.auth == 'env_var'
+        env:
+          KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+        run: |
+          cd SampleApp
+          kb-sdk test
+
+      - name: make resulting app available as artefact in case of failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: kbaseapp-${{ matrix.language }}-${{ matrix.test_type }}-${{ matrix.os }}
+          path: SampleApp
+
+
+  test_existing_repos:
+    if: "!contains(github.event.head_commit.message, 'skip ci')"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-latest]
+        # TODO: add a Java app. WsLargeDataIO does not currently build as it relies on a Java
+        # repo that no longer exists.
+        app: [KBaseReport]  # , WsLargeDataIO]
+        auth: [token, env_var]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8.0.362+9
+
+      - name: Build with Ant
+        run: |
+          make
+
+      - name: Add bin to $PATH
+        run: |
+          echo "$GITHUB_WORKSPACE/bin" >> $GITHUB_PATH
+
+      - name: checking basic kb-sdk functions
+        run: |
+          env
+          kb-sdk help
+          kb-sdk version
+
+      # the following steps check out and run the tests of an existing KBase app
+      - name: Checkout existing kbase module ${{ matrix.app }}
+        uses: actions/checkout@v3
+        with:
+          repository: kbaseapps/${{ matrix.app }}
+          path: kbase_app
+
+      - name: run repo tests, using test.cfg for auth
+        if: matrix.auth == 'token'
+        run: |
+          cd kbase_app
+          kb-sdk test || true
+
+      - name: run repo tests, using test.cfg for auth
+        if: matrix.auth == 'token'
+        env:
+          KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+        run: |
+          cd kbase_app
+          sed -i "s/test_token=/test_token=$KBASE_TEST_TOKEN/" test_local/test.cfg
+          kb-sdk test
+
+      - name: run repo tests, using env var for auth
+        if: matrix.auth == 'env_var'
+        env:
+          KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
+        run: |
+          cd kbase_app
+          kb-sdk test
+
+      - name: make resulting app available as artefact in case of failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: kbaseapp-${{ matrix.app }}-${{ matrix.os }}
+          path: kbase_app

.github/workflows/manual-build.yml

@@ -0,0 +1,11 @@
+---
+name: Manual Build & Push
+on:
+ workflow_dispatch:
+jobs:
+  build-push:
+    uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
+    with:
+      name: '${{ github.event.repository.name }}-develop'
+      tags: br-${{ github.ref_name }}
+    secrets: inherit

.github/workflows/pr_build.yml

@@ -0,0 +1,43 @@
+---
+name: Pull Request Build, Tag, & Push
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+      - master
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - closed
+jobs:
+  build-develop-open:
+    if: github.base_ref == 'develop' && github.event.pull_request.merged == false
+    uses: kbase/.github/.github/workflows/reusable_build.yml@main
+    secrets: inherit
+  build-develop-merge:
+    if: github.base_ref == 'develop' && github.event.pull_request.merged == true
+    uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
+    with:
+      name: '${{ github.event.repository.name }}-develop'
+      tags: pr-${{ github.event.number }},latest
+    secrets: inherit
+  build-main-open:
+    if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == false
+    uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
+    with:
+      name: '${{ github.event.repository.name }}'
+      tags: pr-${{ github.event.number }}
+    secrets: inherit
+  build-main-merge:
+    if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == true
+    uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
+    with:
+      name: '${{ github.event.repository.name }}'
+      tags: pr-${{ github.event.number }},latest-rc
+    secrets: inherit
+  trivy-scans:
+    if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false
+    uses: kbase/.github/.github/workflows/reusable_trivy-scans.yml@main
+    secrets: inherit

.github/workflows/release-main.yml

@@ -0,0 +1,25 @@
+---
+name: Release - Build & Push Image
+on:
+  release:
+    branches:
+      - main
+      - master
+    types: [ published ]
+jobs:
+  check-source-branch:
+    uses: kbase/.github/.github/workflows/reusable_validate-branch.yml@main
+    with:
+      build_branch: '${{ github.event.release.target_commitish }}'
+  validate-release-tag:
+    needs: check-source-branch
+    uses: kbase/.github/.github/workflows/reusable_validate-release-tag.yml@main
+    with:
+      release_tag: '${{ github.event.release.tag_name }}'
+  build-push:
+    needs: validate-release-tag
+    uses: kbase/.github/.github/workflows/reusable_build-push.yml@main
+    with:
+      name: '${{ github.event.repository.name }}'
+      tags: '${{ github.event.release.tag_name }},latest'
+    secrets: inherit

.gitignore

@@ -2,8 +2,6 @@
 /temp
 /dist
 /eclipse-classes/
-/sdkbase/ssl
-/sdkbase/cluster.ini
 /classes/
 /temp_*
 /ASimpleModule*
@@ -13,3 +11,4 @@
 /test_scripts/test.cfg
 *.pyc
 env-*/
+submodules/auth

Dockerfile

@@ -1,24 +1,27 @@
-FROM ubuntu:14.04
-MAINTAINER Shane Canon <[email protected]>
+FROM ubuntu:20.04
+LABEL MAINTAINER KBase developers
 
 # Update apt and install jdk and docker engine to get docker clients
+# Docker installation instructions from https://docs.docker.com/engine/install/ubuntu/
 RUN apt-get -y update && \
-    apt-get -y install openjdk-7-jdk make git ant && \
-    apt-get -y install apt-transport-https ca-certificates && \
-    apt-key adv \
-               --keyserver hkp://ha.pool.sks-keyservers.net:80 \
-               --recv-keys 58118E89F3A912897C070ADBF76221572C52609D && \
-    echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list && \
-    apt-get -y update && apt-get -y install docker-engine=1.11.2-0~trusty 
+    DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata openjdk-8-jdk make git ant curl gnupg-agent apt-transport-https ca-certificates software-properties-common && \
+    update-java-alternatives -s java-1.8.0-openjdk-amd64 && \
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
+    add-apt-repository \
+    "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+    $(lsb_release -cs) \
+    stable" && \
+    apt-get -y update && \
+    apt-get -y install docker-ce docker-ce-cli containerd.io docker-compose-plugin
 
+# Add kb-sdk src and fix CallbackServer interface
 ADD . /src
 
-# Add kb_sdk src and fix CallbackServer interface
 RUN \
-   cd /src && \
-   sed -i 's/en0/eth0/' src/java/us/kbase/common/executionengine/CallbackServer.java && \
-   make && \
-   /src/entrypoint prune && rm -rf /src/.git
+    cd /src && \
+    sed -i 's/en0/eth0/' src/java/us/kbase/common/executionengine/CallbackServer.java && \
+    make && \
+    /src/entrypoint prune && rm -rf /src/.git
 
 ENV PATH=$PATH:/src/bin
 

Makefile

@@ -18,7 +18,7 @@ KBASE_COMMON_JAR = kbase/common/kbase-common-0.0.23.jar
 QUOTE = '\''
 
 # make sure our make test works
-.PHONY : test test-python sdkbase
+.PHONY : test test-python
 
 
 default: compile
@@ -59,7 +59,7 @@ bin: jars-submodule-init
 	echo '#!/bin/bash' > bin/kb-sdk
 	echo 'DIR=$(DIR)' >> bin/kb-sdk
 	echo 'KBASE_JARS_DIR=$$DIR/submodules/jars/lib/jars' >> bin/kb-sdk
-	@# Next command processes links in JAR_DEPS_BIN file and has 5 parts (one on each line): 
+	@# Next command processes links in JAR_DEPS_BIN file and has 5 parts (one on each line):
 	@#  (1) removing comments
 	@#  (2) trimming each line (picking first word actually)
 	@#  (3) skipping empty lines
@@ -103,11 +103,6 @@ deploy-scripts:
 	fi;
 	$(ANT) deploy_bin -DBIN_TARGET=$(TARGET)/bin -DBIN_LIB_TARGET=$(TARGET)/lib -DKBASE_COMMON_JAR=$(KBASE_COMMON_JAR)
 
-sdkbase:
-	# docker rmi -f kbase/deplbase:latest
-	cd sdkbase && ./makeconfig
-	docker build --no-cache -t kbase/kbase:sdkbase2.latest sdkbase
-
 test: submodule-init
 	@echo "Running unit tests"
 	make test-python