Merge pull request #183 from chavafg/1.9.7-branch-bump

# Kata Containers 1.9.7
release: Kata Containers 1.9.7
2026-02-27 09:12:24 +00:00 · 2020-04-17 16:44:27 -05:00 · 2020-04-17 17:56:02 +00:00 · 2020-03-16 10:27:26 -07:00 · 2020-03-16 12:43:19 +00:00 · 2020-02-19 12:36:37 -06:00
5 changed files with 25 additions and 63 deletions
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -16,7 +16,7 @@ jobs:
         popd
         ./packaging/artifact-list.sh > artifact-list.txt
      - name: save-artifact-list
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: artifact-list
          path: artifact-list.txt
@@ -29,7 +29,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - run: |
@@ -44,7 +44,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-kernel.tar.gz
@@ -57,7 +57,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - run: |
@@ -72,7 +72,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-experimental-kernel.tar.gz
@@ -85,7 +85,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-qemu
@@ -98,7 +98,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-qemu.tar.gz
@@ -111,7 +111,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-nemu
@@ -124,7 +124,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-nemu.tar.gz
@@ -138,7 +138,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-qemu-virtiofsd
@@ -151,7 +151,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-qemu-virtiofsd.tar.gz
@@ -165,7 +165,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-image
@@ -178,7 +178,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-image.tar.gz
@@ -192,7 +192,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-firecracker
@@ -205,7 +205,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-firecracker.tar.gz
@@ -219,7 +219,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-clh
@@ -232,7 +232,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-clh.tar.gz
@@ -246,7 +246,7 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifact-list
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: artifact-list
      - name: build-kata-components
@@ -259,7 +259,7 @@ jobs:
         fi
      - name: store-artifacts
        if: env.artifact-built == 'true'
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: kata-artifacts
          path: kata-static-kata-components.tar.gz
@@ -270,14 +270,14 @@ jobs:
    steps:
      - uses: actions/checkout@v1
      - name: get-artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: kata-artifacts
      - name: colate-artifacts
        run: |
          $GITHUB_WORKSPACE/.github/workflows/gather-artifacts.sh
      - name: store-artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@master
        with:
          name: release-candidate
          path: kata-static.tar.xz
@@ -287,7 +287,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: get-artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: release-candidate
      - name: build-and-push-kata-deploy-ci
@@ -328,7 +328,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: download-artifacts
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@master
        with:
          name: release-candidate
      - name: install hub
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +0,0 @@
-# Copyright (c) 2019 Ant Financial
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-sudo: required
-dist: bionic
-
-os:
-    - linux
-
-language: rust
-rust:
-    - stable
-
-env:
-    - target_branch=$TRAVIS_BRANCH RUST_AGENT=yes
-
-before_install:
-    - "ci/setup.sh"
-    - "ci/install_go.sh"
-    - "ci/install_rust.sh"
-    - "ci/static-checks.sh"
-
-# need to install rust from scratch?
-# still need go to download github.com/kata-containers/tests
-# which is already installed?
-
-install:
-    - cd ${TRAVIS_BUILD_DIR}/src/agent && make
-
-script:
-    - cd ${TRAVIS_BUILD_DIR}/src/agent && make check
--- a/2
+++ b/2
@@ -1 +1 @@
-1.10.4
+1.9.7
--- a/src/agent/rustjail/Cargo.toml
+++ b/src/agent/rustjail/Cargo.toml
@@ -22,4 +22,4 @@ slog = "2.5.2"
 slog-scope = "4.1.2"
 scan_fmt = "0.2"
 regex = "1.1"
-path-absolutize = { git = "git://github.com/magiclen/path-absolutize.git", tag= "v1.2.0" }
+path-absolutize = { git = "git://github.com/magiclen/path-absolutize.git", tag= "v1.1.3" }
--- a/src/agent/rustjail/src/validator.rs
+++ b/src/agent/rustjail/src/validator.rs
@@ -1,8 +1,3 @@
-// Copyright (c) 2019 Ant Financial
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
 use crate::container::Config;
 use crate::errors::*;
 use lazy_static;
Author	SHA1	Message	Date
Jose Carlos Venegas Munoz	531483b65d	Merge pull request #183 from chavafg/1.9.7-branch-bump # Kata Containers 1.9.7	2020-04-17 16:44:27 -05:00
Salvador Fuentes	23673b50f0	release: Kata Containers 1.9.7 Version bump no changes Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>	2020-04-17 17:56:02 +00:00
Archana Shinde	8997af5d1d	Merge pull request #163 from bergwolf/1.9.6-branch-bump # Kata Containers 1.9.6	2020-03-16 10:27:26 -07:00
Peng Tao	74d8b67fd7	release: Kata Containers 1.9.6 Version bump no changes Signed-off-by: Peng Tao <bergwolf@hyper.sh>	2020-03-16 12:43:19 +00:00
Salvador Fuentes	f56ac785f2	Merge pull request #141 from amshinde/1.9.5-branch-bump # Kata Containers 1.9.5	2020-02-19 12:36:37 -06:00
Archana Shinde	9f0f539ded	release: Kata Containers 1.9.5 Version bump no changes Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>	2020-02-18 19:24:19 +00:00
GabyCT	e2f03560b4	Merge pull request #120 from jcvenegas/1.9.4-branch-bump # Kata Containers 1.9.4	2020-01-14 13:59:41 -06:00
Jose Carlos Venegas Munoz	0b5569ba6b	travis: remove rust checks rust ci was not part of stable 1.9. Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>	2020-01-14 19:53:38 +00:00
Jose Carlos Venegas Munoz	199762cde2	release: Kata Containers 1.9.4 The branch 1.9 was created after Kata VERSION is created, for the current release process this is repository is not needed but CI will fail doing checkout for this repository, also CI for releases will check that all repos are in the same version so it is only needed for CI correctness. - version: Add VERSION file - ci: Add minimal makefile to use central go test script - netlink: pull out netlink as library crate. - Fixup workflow 103 `8d60612` version: Add VERSION file `a5192a1` netlink: pull out netlink as library crate. `3881c06` ci: Add minimal makefile to use central go test script `1c57665` workflows: make sure we build the experimental kernel, CLH `cbd5fa0` workflows: fix step output usage Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>	2020-01-14 19:41:41 +00:00
Jose Carlos Venegas Munoz	3b6a837664	Merge pull request #115 from jcvenegas/fix-114 version: Add VERSION file	2020-01-07 14:42:55 -06:00
Jose Carlos Venegas Munoz	8d60612052	version: Add VERSION file Needed by some CI scripts, like release or to verify stable branches state. Fixes: #114 Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>	2020-01-07 19:25:33 +00:00
@@ -1 +1 @@
 .10.4
 .9.7